master..188c256 · typeable/aeson

git.iko.soy/typeable/aeson

on 188c256 help sign in

.gitignore−1

since splitsnapshots

unifiedsplit

@@ -5,7 +5,6 @@ dist-newstyle

5cabal.sandbox.config

6.stack-work/

7.stack-work-bench/

8−*.yaml.lock

10*.o

9*.o

11*.hi

10*.hi

.hlint.yaml+1−6

@@ -3,9 +3,4 @@

3 name: "Reduce duplication"

4 within:

5 - Data.Aeson.Types.ToJSON

6−- ignore:

7− name: "Eta reduce"

6+- ignore: {name: "Eta reduce" }

8−- ignore:

9− name: "Use newtype instead of data"

10− within:

11− - Data.Aeson.Types.Internal

.travis.yml+23−34

@@ -12,58 +12,47 @@ cache:

12 - $HOME/.stack

13 - $HOME/.cabsnap

14 - $HOME/.cabal/packages

15− - $HOME/.cabal/store

17before_cache:

16before_cache:

18 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log

17 - rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log

19− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.*

18+ - rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar

20− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/*.json

21− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.cache

22− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar

23− - rm -fv $HOME/.cabal/packages/hackage.haskell.org/01-index.tar.idx

25matrix:

20matrix:

26 include:

21 include:

27−

28− - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.4

22+ - env: BUILD=hlint CABALVER=2.2 GHCVER=8.4.3

29− compiler: ": #GHC 8.4.4"

23+ compiler: ": #GHC 8.4.3"

30− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

24+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

31−

32− - env: BUILD=stack CABALVER=2.4 GHCVER=8.6.5 STACK_YAML=stack-bench.yaml

25+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.3 STACK_YAML=stack-bench.yaml

33− compiler: ": #GHC 8.6.5"

26+ compiler: ": #GHC 8.4.3"

34− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

27+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

35−

36− - env: BUILD=stack CABALVER=2.2 GHCVER=8.6.5 STACK_YAML=stack-ffi-unescape.yaml

28+ - env: BUILD=stack CABALVER=2.2 GHCVER=8.4.3 STACK_YAML=stack-ffi-unescape.yaml

37− compiler: ": #GHC 8.6.5"

29+ compiler: ": #GHC 8.4.3"

38− addons: {apt: {packages: [cabal-install-2.2,ghc-8.6.5], sources: [hvr-ghc]}}

30+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

39−

31+

40− - env: BUILD=cabal2 CABALVER=3.0 GHCVER=8.8.1

41− compiler: ": #GHC 8.8.1"

42− addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1], sources: [hvr-ghc]}}

43−

44− - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.5

32+ - env: BUILD=cabal CABALVER=2.4 GHCVER=8.6.1

45− compiler: ": #GHC 8.6.5"

33+ compiler: ": #GHC 8.6.1"

46− addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.5], sources: [hvr-ghc]}}

34+ addons: {apt: {packages: [cabal-install-2.4,ghc-8.6.1], sources: [hvr-ghc]}}

47−

48− - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.4

35+ - env: BUILD=cabal CABALVER=2.2 GHCVER=8.4.3

49− compiler: ": #GHC 8.4.4"

36+ compiler: ": #GHC 8.4.3"

50− addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.4], sources: [hvr-ghc]}}

37+ addons: {apt: {packages: [cabal-install-2.2,ghc-8.4.3], sources: [hvr-ghc]}}

51−

52 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2

38 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.2.2

53 compiler: ": #GHC 8.2.2"

39 compiler: ": #GHC 8.2.2"

54 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

40 addons: {apt: {packages: [cabal-install-2.0,ghc-8.2.2], sources: [hvr-ghc]}}

55−

56 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2

41 - env: BUILD=cabal CABALVER=2.0 GHCVER=8.0.2

57 compiler: ": #GHC 8.0.2"

42 compiler: ": #GHC 8.0.2"

58 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}

43 addons: {apt: {packages: [cabal-install-2.0,ghc-8.0.2], sources: [hvr-ghc]}}

59−

60 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

44 - env: BUILD=cabal CABALVER=1.22 GHCVER=7.10.3

61 compiler: ": #GHC 7.10.3"

45 compiler: ": #GHC 7.10.3"

62 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

46 addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.3], sources: [hvr-ghc]}}

63−

64 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4

47 - env: BUILD=cabal CABALVER=1.18 GHCVER=7.8.4

65 compiler: ": #GHC 7.8.4"

48 compiler: ": #GHC 7.8.4"

66 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}

49 addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}

50+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.6.3

51+ compiler: ": #GHC 7.6.3"

52+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}

53+ - env: BUILD=cabal CABALVER=1.18 GHCVER=7.4.2

54+ compiler: ": #GHC 7.4.2"

55+ addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}

68before_install:

57before_install:

69 - unset CC

58 - unset CC

CONTRIBUTING.md−38

@@ -58,41 +58,3 @@ import Foo as F

58import Qux (Q(..), q)

59import qualified A

60```

61−

62−## Development Workflow (If you plan on using Stack)

63−

64−Here we outline a general workflow new contributors could adopt for a nice incremental development experience.

65−

66−The root folder consists of two stack-*.yaml config files.

67−

68−1. stack-nightly.yaml - Config file defines all the settings to build and test any changes.

69−2. stack-bench.yaml - Used to run benchmark tests.

70−3. stack-ffi-unescape.yaml - This is for replacing certain parts with a C-implementation.

71−

72−Therefore, a ghci development experience would be:

73−

74−1. `stack ghci --stack-yaml stack-nightly.yaml --test`

75−2. :r to recompile

76−3. `main` to run all tests, or `:main --pattern Foo` to run specific tests matched by pattern.

77−

78−Some discussion on this topic can also be found here [here](https://github.com/bos/aeson/issues/733)

79−

80−Of course before submitting a PR, the following steps are recommended:

81−

82−1. 'stack test --stack-yaml stack-nightly.yaml` - Run the entire suite of tests

83−2. `make hlint` - Run hlint on the source folders.

84−3. 'stack test --stack-yaml stack-bench.yaml` - Run the benchmark tests if you believe your changes could affect the benchmarks.

85−

86−## Development Workflow (If you plan on using Cabal)

87−

88−A ghci development experience would be:

89−

90−1. `cabal new-repl test:tests`

91−2. `:r` to recompile

92−3. `Main.main` to run all tests, or `:m Main; :main --pattern Foo` to run specific tests matched by pattern.

93−

94−Of course before submitting a PR, the following steps are recommended:

95−

96−1. `cabal new-test` - Run the entire suite of tests

97−2. `make hlint` - Run hlint on the source folders.

98−3. Uncomment the `benchmarks` line in `cabal.project` - Run the benchmark tests if you believe your changes could affect the benchmarks.

Data/Aeson.hs−9

@@ -70,11 +70,6 @@ module Data.Aeson

70 , ToJSONKeyFunction(..)

71 , FromJSONKey(..)

72 , FromJSONKeyFunction(..)

73− -- *** Generic keys

74− , GToJSONKey()

75− , genericToJSONKey

76− , GFromJSONKey()

77− , genericFromJSONKey

78 -- ** Liftings to unary and binary type constructors

73 -- ** Liftings to unary and binary type constructors

79 , FromJSON1(..)

74 , FromJSON1(..)

80 , parseJSON1

75 , parseJSON1

@@ -116,10 +111,6 @@ module Data.Aeson

116 , SumEncoding(..)

111 , SumEncoding(..)

117 , camelTo2

112 , camelTo2

118 , defaultTaggedObject

113 , defaultTaggedObject

119− -- ** Options for object keys

120− , JSONKeyOptions

121− , keyModifier

122− , defaultJSONKeyOptions

123

114

124 -- * Inspecting @'Value's@

115 -- * Inspecting @'Value's@

125 , withObject

116 , withObject

Data/Aeson/Compat.hsnew file+16

@@ -0,0 +1,16 @@

1+{-# LANGUAGE CPP #-}

3+module Data.Aeson.Compat

4+ (

5+ fromStrict

6+ ) where

8+import qualified Data.ByteString as S

9+import qualified Data.ByteString.Lazy as L

10+

11+fromStrict :: S.ByteString -> L.ByteString

12+#if MIN_VERSION_bytestring(0, 9, 2)

13+fromStrict = L.fromChunks . (:[])

14+#else

15+fromStrict = L.fromStrict

16+#endif

Data/Aeson/Parser.hs+1−11

@@ -35,20 +35,10 @@ module Data.Aeson.Parser

35 , value

36 , jstring

37 , scientific

38− -- ** Handling objects with duplicate keys

39− , jsonWith

40− , jsonLast

41− , jsonAccum

42− , jsonNoDup

43 -- * Strict parsers

38 -- * Strict parsers

44 -- $strict

39 -- $strict

45 , json'

40 , json'

46 , value'

41 , value'

47− -- ** Handling objects with duplicate keys

48− , jsonWith'

49− , jsonLast'

50− , jsonAccum'

51− , jsonNoDup'

52 -- * Decoding without FromJSON instances

42 -- * Decoding without FromJSON instances

53 , decodeWith

43 , decodeWith

54 , decodeStrictWith

44 , decodeStrictWith

@@ -57,7 +47,7 @@ module Data.Aeson.Parser

57 ) where

47 ) where

60−import Data.Aeson.Parser.Internal

50+import Data.Aeson.Parser.Internal (decodeStrictWith, decodeWith, eitherDecodeStrictWith, eitherDecodeWith, json, json', jstring, scientific, value, value')

62-- $lazy

52-- $lazy

63--

53--

Data/Aeson/Parser/Internal.hs+34−148

@@ -5,10 +5,6 @@

5#if MIN_VERSION_ghc_prim(0,3,1)

6{-# LANGUAGE MagicHash #-}

7#endif

8−#if __GLASGOW_HASKELL__ <= 710 && __GLASGOW_HASKELL__ >= 706

9−-- Work around a compiler bug

10−{-# OPTIONS_GHC -fsimpl-tick-factor=200 #-}

11−#endif

12-- |

8-- |

13-- Module: Data.Aeson.Parser.Internal

9-- Module: Data.Aeson.Parser.Internal

@@ -25,43 +21,30 @@ module Data.Aeson.Parser.Internal

25 (

21 (

26 -- * Lazy parsers

22 -- * Lazy parsers

27 json, jsonEOF

23 json, jsonEOF

28− , jsonWith

29− , jsonLast

30− , jsonAccum

31− , jsonNoDup

32 , value

24 , value

33 , jstring

25 , jstring

34 , jstring_

26 , jstring_

35 , scientific

27 , scientific

36 -- * Strict parsers

28 -- * Strict parsers

37 , json', jsonEOF'

29 , json', jsonEOF'

38− , jsonWith'

39− , jsonLast'

40− , jsonAccum'

41− , jsonNoDup'

42 , value'

30 , value'

43 -- * Helpers

31 -- * Helpers

44 , decodeWith

32 , decodeWith

45 , decodeStrictWith

33 , decodeStrictWith

46 , eitherDecodeWith

34 , eitherDecodeWith

47 , eitherDecodeStrictWith

35 , eitherDecodeStrictWith

48− -- ** Handling objects with duplicate keys

49− , fromListAccum

50− , parseListNoDup

51 ) where

36 ) where

53import Prelude.Compat

38import Prelude.Compat

55import Control.Applicative ((<|>))

40import Control.Applicative ((<|>))

56import Control.Monad (void, when)

41import Control.Monad (void, when)

57−import Data.Aeson.Types.Internal (IResult(..), JSONPath, Object, Result(..), Value(..))

42+import Data.Aeson.Types.Internal (IResult(..), JSONPath, Result(..), Value(..))

58import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)

43import Data.Attoparsec.ByteString.Char8 (Parser, char, decimal, endOfInput, isDigit_w8, signed, string)

59−import Data.Function (fix)

60import Data.Functor.Compat (($>))

44import Data.Functor.Compat (($>))

61import Data.Scientific (Scientific)

45import Data.Scientific (Scientific)

62import Data.Text (Text)

46import Data.Text (Text)

63−import Data.Vector (Vector)

64−import qualified Data.Vector as Vector (empty, fromList, fromListN, reverse)

47+import Data.Vector as Vector (Vector, empty, fromListN, reverse)

65import qualified Data.Attoparsec.ByteString as A

48import qualified Data.Attoparsec.ByteString as A

66import qualified Data.Attoparsec.Lazy as L

49import qualified Data.Attoparsec.Lazy as L

67import qualified Data.ByteString as B

50import qualified Data.ByteString as B

@@ -93,7 +76,7 @@ import qualified Data.Text.Encoding as TE

93#define C_n 110

76#define C_n 110

94#define C_t 116

77#define C_t 116

96−-- | Parse any JSON value.

79+-- | Parse a top-level JSON value.

97--

80--

98-- The conversion of a parsed value to a Haskell value is deferred

81-- The conversion of a parsed value to a Haskell value is deferred

99-- until the Haskell value is needed. This may improve performance if

82-- until the Haskell value is needed. This may improve performance if

@@ -103,15 +86,10 @@ import qualified Data.Text.Encoding as TE

103-- This function is an alias for 'value'. In aeson 0.8 and earlier, it

86-- This function is an alias for 'value'. In aeson 0.8 and earlier, it

104-- parsed only object or array types, in conformance with the

87-- parsed only object or array types, in conformance with the

105-- now-obsolete RFC 4627.

88-- now-obsolete RFC 4627.

106−--

107−-- ==== Warning

108−--

109−-- If an object contains duplicate keys, only the first one will be kept.

110−-- For a more flexible alternative, see 'jsonWith'.

111json :: Parser Value

89json :: Parser Value

112json = value

90json = value

113

114−-- | Parse any JSON value.

92+-- | Parse a top-level JSON value.

115--

93--

116-- This is a strict version of 'json' which avoids building up thunks

94-- This is a strict version of 'json' which avoids building up thunks

117-- during parsing; it performs all conversions immediately. Prefer

95-- during parsing; it performs all conversions immediately. Prefer

@@ -120,35 +98,23 @@ json = value

120-- This function is an alias for 'value''. In aeson 0.8 and earlier, it

98-- This function is an alias for 'value''. In aeson 0.8 and earlier, it

121-- parsed only object or array types, in conformance with the

99-- parsed only object or array types, in conformance with the

122-- now-obsolete RFC 4627.

100-- now-obsolete RFC 4627.

123−--

124−-- ==== Warning

125−--

126−-- If an object contains duplicate keys, only the first one will be kept.

127−-- For a more flexible alternative, see 'jsonWith''.

128json' :: Parser Value

101json' :: Parser Value

129json' = value'

102json' = value'

130

103

131−-- Open recursion: object_, object_', array_, array_' are parameterized by the

132−-- toplevel Value parser to be called recursively, to keep the parameter

133−-- mkObject outside of the recursive loop for proper inlining.

134−

135−object_ :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value

104+object_ :: Parser Value

136−object_ mkObject val = {-# SCC "object_" #-} Object <$> objectValues mkObject jstring val

105+object_ = {-# SCC "object_" #-} Object <$> objectValues jstring value

137−{-# INLINE object_ #-}

138

106

139−object_' :: ([(Text, Value)] -> Either String Object) -> Parser Value -> Parser Value

107+object_' :: Parser Value

140−object_' mkObject val' = {-# SCC "object_'" #-} do

108+object_' = {-# SCC "object_'" #-} do

141− !vals <- objectValues mkObject jstring' val'

109+ !vals <- objectValues jstring' value'

142 return (Object vals)

110 return (Object vals)

143 where

111 where

144 jstring' = do

112 jstring' = do

145 !s <- jstring

113 !s <- jstring

146 return s

114 return s

147−{-# INLINE object_' #-}

148

115

149−objectValues :: ([(Text, Value)] -> Either String Object)

150− -> Parser Text -> Parser Value -> Parser (H.HashMap Text Value)

116+objectValues :: Parser Text -> Parser Value -> Parser (H.HashMap Text Value)

151−objectValues mkObject str val = do

117+objectValues str val = do

152 skipSpace

118 skipSpace

153 w <- A.peekWord8'

119 w <- A.peekWord8'

154 if w == CLOSE_CURLY

120 if w == CLOSE_CURLY

@@ -164,20 +130,16 @@ objectValues mkObject str val = do

164 let acc' = (k, v) : acc

130 let acc' = (k, v) : acc

165 if ch == COMMA

131 if ch == COMMA

166 then skipSpace >> loop acc'

132 then skipSpace >> loop acc'

167− else case mkObject acc' of

133+ else return (H.fromList acc')

168− Left err -> fail err

169− Right obj -> pure obj

170{-# INLINE objectValues #-}

134{-# INLINE objectValues #-}

171

135

172−array_ :: Parser Value -> Parser Value

136+array_ :: Parser Value

173−array_ val = {-# SCC "array_" #-} Array <$> arrayValues val

137+array_ = {-# SCC "array_" #-} Array <$> arrayValues value

174−{-# INLINE array_ #-}

175

138

176−array_' :: Parser Value -> Parser Value

139+array_' :: Parser Value

177−array_' val = {-# SCC "array_'" #-} do

140+array_' = {-# SCC "array_'" #-} do

178− !vals <- arrayValues val

141+ !vals <- arrayValues value'

179 return (Array vals)

142 return (Array vals)

180−{-# INLINE array_' #-}

181

143

182arrayValues :: Parser Value -> Parser (Vector Value)

144arrayValues :: Parser Value -> Parser (Vector Value)

183arrayValues val = do

145arrayValues val = do

@@ -195,104 +157,42 @@ arrayValues val = do

195 else return (Vector.reverse (Vector.fromListN len (v:acc)))

157 else return (Vector.reverse (Vector.fromListN len (v:acc)))

196{-# INLINE arrayValues #-}

158{-# INLINE arrayValues #-}

197

159

198−-- | Parse any JSON value. Synonym of 'json'.

160+-- | Parse any JSON value. You should usually 'json' in preference to

199−value :: Parser Value

161+-- this function, as this function relaxes the object-or-array

200−value = jsonWith (pure . H.fromList)

162+-- requirement of RFC 4627.

201−

202−-- | Parse any JSON value.

203−--

204−-- This parser is parameterized by a function to construct an 'Object'

205−-- from a raw list of key-value pairs, where duplicates are preserved.

206−-- The pairs appear in __reverse order__ from the source.

207−--

208−-- ==== __Examples__

209−--

210−-- 'json' keeps only the first occurence of each key, using 'HashMap.Lazy.fromList'.

211−--

212−-- @

213−-- 'json' = 'jsonWith' ('Right' '.' 'H.fromList')

214−-- @

215−--

216−-- 'jsonLast' keeps the last occurence of each key, using

217−-- @'HashMap.Lazy.fromListWith' ('const' 'id')@.

218−--

219−-- @

220−-- 'jsonLast' = 'jsonWith' ('Right' '.' 'HashMap.Lazy.fromListWith' ('const' 'id'))

221−-- @

222--

163--

223−-- 'jsonAccum' keeps wraps all values in arrays to keep duplicates, using

164+-- In particular, be careful in using this function if you think your

224−-- 'fromListAccum'.

165+-- code might interoperate with Javascript. A naïve Javascript

225−--

166+-- library that parses JSON data using @eval@ is vulnerable to attack

226−-- @

167+-- unless the encoded data represents an object or an array. JSON

227−-- 'jsonAccum' = 'jsonWith' ('Right' . 'fromListAccum')

168+-- implementations in other languages conform to that same restriction

228−-- @

169+-- to preserve interoperability and security.

229−--

170+value :: Parser Value

230−-- 'jsonNoDup' fails if any object contains duplicate keys, using 'parseListNoDup'.

171+value = do

231−--

232−-- @

233−-- 'jsonNoDup' = 'jsonWith' 'parseListNoDup'

234−-- @

235−jsonWith :: ([(Text, Value)] -> Either String Object) -> Parser Value

236−jsonWith mkObject = fix $ \value_ -> do

237 skipSpace

172 skipSpace

238 w <- A.peekWord8'

173 w <- A.peekWord8'

239 case w of

174 case w of

240 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)

175 DOUBLE_QUOTE -> A.anyWord8 *> (String <$> jstring_)

241− OPEN_CURLY -> A.anyWord8 *> object_ mkObject value_

176+ OPEN_CURLY -> A.anyWord8 *> object_

242− OPEN_SQUARE -> A.anyWord8 *> array_ value_

177+ OPEN_SQUARE -> A.anyWord8 *> array_

243 C_f -> string "false" $> Bool False

178 C_f -> string "false" $> Bool False

244 C_t -> string "true" $> Bool True

179 C_t -> string "true" $> Bool True

245 C_n -> string "null" $> Null

180 C_n -> string "null" $> Null

246 _ | w >= 48 && w <= 57 || w == 45

181 _ | w >= 48 && w <= 57 || w == 45

247 -> Number <$> scientific

182 -> Number <$> scientific

248 | otherwise -> fail "not a valid json value"

183 | otherwise -> fail "not a valid json value"

249−{-# INLINE jsonWith #-}

250−

251−-- | Variant of 'json' which keeps only the last occurence of every key.

252−jsonLast :: Parser Value

253−jsonLast = jsonWith (Right . H.fromListWith (const id))

254−

255−-- | Variant of 'json' wrapping all object mappings in 'Array' to preserve

256−-- key-value pairs with the same keys.

257−jsonAccum :: Parser Value

258−jsonAccum = jsonWith (Right . fromListAccum)

259−

260−-- | Variant of 'json' which fails if any object contains duplicate keys.

261−jsonNoDup :: Parser Value

262−jsonNoDup = jsonWith parseListNoDup

263

184

264−-- | @'fromListAccum' kvs@ is an object mapping keys to arrays containing all

265−-- associated values from the original list @kvs@.

266−--

267−-- >>> fromListAccum [("apple", Bool True), ("apple", Bool False), ("orange", Bool False)]

268−-- fromList [("apple", [Bool False, Bool True]), ("orange", [Bool False])]

269−fromListAccum :: [(Text, Value)] -> Object

270−fromListAccum =

271− fmap (Array . Vector.fromList . ($ [])) . H.fromListWith (.) . (fmap . fmap) (:)

272−

273−-- | @'fromListNoDup' kvs@ fails if @kvs@ contains duplicate keys.

274−parseListNoDup :: [(Text, Value)] -> Either String Object

275−parseListNoDup =

276− H.traverseWithKey unwrap . H.fromListWith (\_ _ -> Nothing) . (fmap . fmap) Just

277− where

278− unwrap k Nothing = Left $ "found duplicate key: " ++ show k

279− unwrap _ (Just v) = Right v

280−

281−-- | Strict version of 'value'. Synonym of 'json''.

185+-- | Strict version of 'value'. See also 'json''.

282value' :: Parser Value

186value' :: Parser Value

283−value' = jsonWith' (pure . H.fromList)

187+value' = do

284−

285−-- | Strict version of 'jsonWith'.

286−jsonWith' :: ([(Text, Value)] -> Either String Object) -> Parser Value

287−jsonWith' mkObject = fix $ \value_ -> do

288 skipSpace

188 skipSpace

289 w <- A.peekWord8'

189 w <- A.peekWord8'

290 case w of

190 case w of

291 DOUBLE_QUOTE -> do

191 DOUBLE_QUOTE -> do

292 !s <- A.anyWord8 *> jstring_

192 !s <- A.anyWord8 *> jstring_

293 return (String s)

193 return (String s)

294− OPEN_CURLY -> A.anyWord8 *> object_' mkObject value_

194+ OPEN_CURLY -> A.anyWord8 *> object_'

295− OPEN_SQUARE -> A.anyWord8 *> array_' value_

195+ OPEN_SQUARE -> A.anyWord8 *> array_'

296 C_f -> string "false" $> Bool False

196 C_f -> string "false" $> Bool False

297 C_t -> string "true" $> Bool True

197 C_t -> string "true" $> Bool True

298 C_n -> string "null" $> Null

198 C_n -> string "null" $> Null

@@ -301,20 +201,6 @@ jsonWith' mkObject = fix $ \value_ -> do

301 !n <- scientific

201 !n <- scientific

302 return (Number n)

202 return (Number n)

303 | otherwise -> fail "not a valid json value"

203 | otherwise -> fail "not a valid json value"

304−{-# INLINE jsonWith' #-}

305−

306−-- | Variant of 'json'' which keeps only the last occurence of every key.

307−jsonLast' :: Parser Value

308−jsonLast' = jsonWith' (pure . H.fromListWith (const id))

309−

310−-- | Variant of 'json'' wrapping all object mappings in 'Array' to preserve

311−-- key-value pairs with the same keys.

312−jsonAccum' :: Parser Value

313−jsonAccum' = jsonWith' (pure . fromListAccum)

314−

315−-- | Variant of 'json'' which fails if any object contains duplicate keys.

316−jsonNoDup' :: Parser Value

317−jsonNoDup' = jsonWith' parseListNoDup

318

204

319-- | Parse a quoted JSON string.

205-- | Parse a quoted JSON string.

320jstring :: Parser Text

206jstring :: Parser Text

Data/Aeson/TH.hs+38−24

@@ -135,15 +135,22 @@ import Data.Map (Map)

135import Data.Maybe (catMaybes, fromMaybe, mapMaybe)

136import qualified Data.Monoid as Monoid

137import Data.Set (Set)

138+#if MIN_VERSION_template_haskell(2,8,0)

138import Language.Haskell.TH hiding (Arity)

139import Language.Haskell.TH hiding (Arity)

140+#else

141+import Language.Haskell.TH

142+#endif

139import Language.Haskell.TH.Datatype

143import Language.Haskell.TH.Datatype

144+#if MIN_VERSION_template_haskell(2,7,0) && !(MIN_VERSION_template_haskell(2,8,0))

145+import Language.Haskell.TH.Lib (starK)

146+#endif

140#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))

147#if MIN_VERSION_template_haskell(2,8,0) && !(MIN_VERSION_template_haskell(2,10,0))

141import Language.Haskell.TH.Syntax (mkNameG_tc)

148import Language.Haskell.TH.Syntax (mkNameG_tc)

142#endif

149#endif

143import Text.Printf (printf)

150import Text.Printf (printf)

144import qualified Data.Aeson.Encoding.Internal as E

151import qualified Data.Aeson.Encoding.Internal as E

145import qualified Data.Foldable as F (all)

152import qualified Data.Foldable as F (all)

146−import qualified Data.HashMap.Strict as H (difference, fromList, keys, lookup, toList)

153+import qualified Data.HashMap.Strict as H (lookup, toList)

147import qualified Data.List.NonEmpty as NE (length, reverse)

154import qualified Data.List.NonEmpty as NE (length, reverse)

148import qualified Data.Map as M (fromList, keys, lookup , singleton, size)

155import qualified Data.Map as M (fromList, keys, lookup , singleton, size)

149import qualified Data.Semigroup as Semigroup (Option(..))

156import qualified Data.Semigroup as Semigroup (Option(..))

@@ -922,32 +929,12 @@ parseRecord :: JSONClass

922 -> Name

929 -> Name

923 -> [Name]

930 -> [Name]

924 -> Name

931 -> Name

925− -> Bool

926 -> ExpQ

932 -> ExpQ

927−parseRecord jc tvMap argTys opts tName conName fields obj inTaggedObject =

933+parseRecord jc tvMap argTys opts tName conName fields obj =

928− (if rejectUnknownFields opts

929− then infixApp checkUnknownRecords [|(>>)|]

930− else id) $

931 foldl' (\a b -> infixApp a [|(<*>)|] b)

934 foldl' (\a b -> infixApp a [|(<*>)|] b)

932 (infixApp (conE conName) [|(<$>)|] x)

935 (infixApp (conE conName) [|(<$>)|] x)

933 xs

936 xs

934 where

937 where

935− tagFieldNameAppender =

936− if inTaggedObject then (tagFieldName (sumEncoding opts) :) else id

937− knownFields = appE [|H.fromList|] $ listE $

938− map (\knownName -> tupE [appE [|T.pack|] $ litE $ stringL knownName, [|()|]]) $

939− tagFieldNameAppender $ map nameBase fields

940− checkUnknownRecords =

941− caseE (appE [|H.keys|] $ infixApp (varE obj) [|H.difference|] knownFields)

942− [ match (listP []) (normalB [|return ()|]) []

943− , newName "unknownFields" >>=

944− \unknownFields -> match (varP unknownFields)

945− (normalB $ appE [|fail|] $ infixApp

946− (litE (stringL "Unknown fields: "))

947− [|(++)|]

948− (appE [|show|] (varE unknownFields)))

949− []

950− ]

951 x:xs = [ [|lookupField|]

938 x:xs = [ [|lookupField|]

952 `appE` dispatchParseJSON jc conName tvMap argTy

939 `appE` dispatchParseJSON jc conName tvMap argTy

953 `appE` litE (stringL $ show tName)

940 `appE` litE (stringL $ show tName)

@@ -1022,7 +1009,7 @@ parseArgs jc tvMap tName opts

1022 , constructorFields = argTys }

1009 , constructorFields = argTys }

1023 (Left (_, obj)) = do

1010 (Left (_, obj)) = do

1024 argTys' <- mapM resolveTypeSynonyms argTys

1011 argTys' <- mapM resolveTypeSynonyms argTys

1025− parseRecord jc tvMap argTys' opts tName conName fields obj True

1012+ parseRecord jc tvMap argTys' opts tName conName fields obj

1026parseArgs jc tvMap tName opts

1013parseArgs jc tvMap tName opts

1027 info@ConstructorInfo { constructorName = conName

1014 info@ConstructorInfo { constructorName = conName

1028 , constructorVariant = RecordConstructor fields

1015 , constructorVariant = RecordConstructor fields

@@ -1037,7 +1024,7 @@ parseArgs jc tvMap tName opts

1037 argTys' <- mapM resolveTypeSynonyms argTys

1024 argTys' <- mapM resolveTypeSynonyms argTys

1038 caseE (varE valName)

1025 caseE (varE valName)

1039 [ match (conP 'Object [varP obj]) (normalB $

1026 [ match (conP 'Object [varP obj]) (normalB $

1040− parseRecord jc tvMap argTys' opts tName conName fields obj False) []

1027+ parseRecord jc tvMap argTys' opts tName conName fields obj) []

1041 , matchFailed tName conName "Object"

1028 , matchFailed tName conName "Object"

1042 ]

1029 ]

1043

1030

@@ -1603,13 +1590,21 @@ type TyVarMap = Map Name (Name, Name)

1603-- | Returns True if a Type has kind *.

1590-- | Returns True if a Type has kind *.

1604hasKindStar :: Type -> Bool

1591hasKindStar :: Type -> Bool

1605hasKindStar VarT{} = True

1592hasKindStar VarT{} = True

1593+#if MIN_VERSION_template_haskell(2,8,0)

1606hasKindStar (SigT _ StarT) = True

1594hasKindStar (SigT _ StarT) = True

1595+#else

1596+hasKindStar (SigT _ StarK) = True

1597+#endif

1607hasKindStar _ = False

1598hasKindStar _ = False

1608

1599

1609-- Returns True is a kind is equal to *, or if it is a kind variable.

1600-- Returns True is a kind is equal to *, or if it is a kind variable.

1610isStarOrVar :: Kind -> Bool

1601isStarOrVar :: Kind -> Bool

1602+#if MIN_VERSION_template_haskell(2,8,0)

1611isStarOrVar StarT = True

1603isStarOrVar StarT = True

1612isStarOrVar VarT{} = True

1604isStarOrVar VarT{} = True

1605+#else

1606+isStarOrVar StarK = True

1607+#endif

1613isStarOrVar _ = False

1608isStarOrVar _ = False

1614

1609

1615-- Generate a list of fresh names with a common prefix, and numbered suffixes.

1610-- Generate a list of fresh names with a common prefix, and numbered suffixes.

@@ -1667,7 +1662,9 @@ isTyFamily (ConT n) = do

1667#else

1662#else

1668 FamilyI (FamilyD TypeFam _ _ _) _ -> True

1663 FamilyI (FamilyD TypeFam _ _ _) _ -> True

1669#endif

1664#endif

1665+#if MIN_VERSION_template_haskell(2,9,0)

1670 FamilyI ClosedTypeFamilyD{} _ -> True

1666 FamilyI ClosedTypeFamilyD{} _ -> True

1667+#endif

1671 _ -> False

1668 _ -> False

1672isTyFamily _ = return False

1669isTyFamily _ = return False

1673

1670

@@ -1695,7 +1692,9 @@ mentionsName = go

1695 go :: Type -> [Name] -> Bool

1692 go :: Type -> [Name] -> Bool

1696 go (AppT t1 t2) names = go t1 names || go t2 names

1693 go (AppT t1 t2) names = go t1 names || go t2 names

1697 go (SigT t _k) names = go t names

1694 go (SigT t _k) names = go t names

1695+#if MIN_VERSION_template_haskell(2,8,0)

1698 || go _k names

1696 || go _k names

1697+#endif

1699 go (VarT n) names = n `elem` names

1698 go (VarT n) names = n `elem` names

1700 go _ _ = False

1699 go _ _ = False

1701

1700

@@ -1751,14 +1750,23 @@ uncurryTy t = ([], t :| [])

1751

1750

1752-- | Like uncurryType, except on a kind level.

1751-- | Like uncurryType, except on a kind level.

1753uncurryKind :: Kind -> NonEmpty Kind

1752uncurryKind :: Kind -> NonEmpty Kind

1753+#if MIN_VERSION_template_haskell(2,8,0)

1754uncurryKind = snd . uncurryTy

1755+#else

1756+uncurryKind (ArrowK k1 k2) = k1 <| uncurryKind k2

1757+uncurryKind k = k :| []

1758+#endif

1755

1759

1756createKindChain :: Int -> Kind

1760createKindChain :: Int -> Kind

1757createKindChain = go starK

1761createKindChain = go starK

1758 where

1762 where

1759 go :: Kind -> Int -> Kind

1763 go :: Kind -> Int -> Kind

1760 go k 0 = k

1764 go k 0 = k

1765+#if MIN_VERSION_template_haskell(2,8,0)

1761 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)

1766 go k !n = go (AppT (AppT ArrowT StarT) k) (n - 1)

1767+#else

1768+ go k !n = go (ArrowK StarK k) (n - 1)

1769+#endif

1762

1770

1763-- | Makes a string literal expression from a constructor's name.

1771-- | Makes a string literal expression from a constructor's name.

1764conNameExp :: Options -> ConstructorInfo -> Q Exp

1772conNameExp :: Options -> ConstructorInfo -> Q Exp

@@ -1812,7 +1820,11 @@ canEtaReduce remaining dropped =

1812-------------------------------------------------------------------------------

1820-------------------------------------------------------------------------------

1813

1821

1814applySubstitutionKind :: Map Name Kind -> Type -> Type

1822applySubstitutionKind :: Map Name Kind -> Type -> Type

1823+#if MIN_VERSION_template_haskell(2,8,0)

1815applySubstitutionKind = applySubstitution

1824applySubstitutionKind = applySubstitution

1825+#else

1826+applySubstitutionKind _ t = t

1827+#endif

1816

1828

1817substNameWithKind :: Name -> Kind -> Type -> Type

1829substNameWithKind :: Name -> Kind -> Type -> Type

1818substNameWithKind n k = applySubstitutionKind (M.singleton n k)

1830substNameWithKind n k = applySubstitutionKind (M.singleton n k)

@@ -1976,7 +1988,9 @@ data StarKindStatus = NotKindStar

1976canRealizeKindStar :: Type -> StarKindStatus

1988canRealizeKindStar :: Type -> StarKindStatus

1977canRealizeKindStar t = case t of

1989canRealizeKindStar t = case t of

1978 _ | hasKindStar t -> KindStar

1990 _ | hasKindStar t -> KindStar

1991+#if MIN_VERSION_template_haskell(2,8,0)

1979 SigT _ (VarT k) -> IsKindVar k

1992 SigT _ (VarT k) -> IsKindVar k

1993+#endif

1980 _ -> NotKindStar

1994 _ -> NotKindStar

1981

1995

1982-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.

1996-- | Returns 'Just' the kind variable 'Name' of a 'StarKindStatus' if it exists.

Data/Aeson/Types.hs−19

@@ -53,12 +53,6 @@ module Data.Aeson.Types

53 , coerceFromJSONKeyFunction

54 , mapFromJSONKeyFunction

56− -- *** Generic keys

57− , GToJSONKey()

58− , genericToJSONKey

59− , GFromJSONKey()

60− , genericFromJSONKey

61−

62 -- ** Liftings to unary and binary type constructors

56 -- ** Liftings to unary and binary type constructors

63 , FromJSON1(..)

57 , FromJSON1(..)

64 , parseJSON1

58 , parseJSON1

@@ -124,7 +118,6 @@ module Data.Aeson.Types

124 , sumEncoding

118 , sumEncoding

125 , unwrapUnaryRecords

119 , unwrapUnaryRecords

126 , tagSingleConstructors

120 , tagSingleConstructors

127− , rejectUnknownFields

128

121

129 -- ** Options utilities

122 -- ** Options utilities

130 , SumEncoding(..)

123 , SumEncoding(..)

@@ -132,18 +125,6 @@ module Data.Aeson.Types

132 , camelTo2

125 , camelTo2

133 , defaultOptions

126 , defaultOptions

134 , defaultTaggedObject

127 , defaultTaggedObject

135−

136− -- ** Options for object keys

137− , JSONKeyOptions

138− , keyModifier

139− , defaultJSONKeyOptions

140−

141− -- * Parsing context

142− , (<?>)

143− , JSONPath

144− , JSONPathElement(..)

145− , formatPath

146− , formatRelativePath

147 ) where

128 ) where

148

129

149import Prelude.Compat

130import Prelude.Compat

Data/Aeson/Types/Class.hs−5

@@ -58,11 +58,6 @@ module Data.Aeson.Types.Class

58 , fromJSONKeyCoerce

59 , coerceFromJSONKeyFunction

60 , mapFromJSONKeyFunction

61− -- ** Generic keys

62− , GToJSONKey()

63− , genericToJSONKey

64− , GFromJSONKey()

65− , genericFromJSONKey

66 -- * Object key-value pairs

61 -- * Object key-value pairs

67 , KeyValue(..)

62 , KeyValue(..)

Data/Aeson/Types/FromJSON.hs+83−160

@@ -5,16 +5,19 @@

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE GADTs #-}

7{-# LANGUAGE MultiParamTypeClasses #-}

8+{-# LANGUAGE NamedFieldPuns #-}

8{-# LANGUAGE NoImplicitPrelude #-}

9{-# LANGUAGE NoImplicitPrelude #-}

9{-# LANGUAGE OverloadedStrings #-}

10{-# LANGUAGE OverloadedStrings #-}

10−{-# LANGUAGE PolyKinds #-}

11{-# LANGUAGE RecordWildCards #-}

12{-# LANGUAGE ScopedTypeVariables #-}

13{-# LANGUAGE TypeOperators #-}

14−{-# LANGUAGE TupleSections #-}

15{-# LANGUAGE UndecidableInstances #-}

14{-# LANGUAGE UndecidableInstances #-}

16{-# LANGUAGE ViewPatterns #-}

15{-# LANGUAGE ViewPatterns #-}

17+#if __GLASGOW_HASKELL__ >= 706

18+{-# LANGUAGE PolyKinds #-}

19+#endif

20+

18#include "incoherent-compat.h"

21#include "incoherent-compat.h"

19#include "overlapping-compat.h"

22#include "overlapping-compat.h"

@@ -42,9 +45,6 @@ module Data.Aeson.Types.FromJSON

42 , coerceFromJSONKeyFunction

45 , coerceFromJSONKeyFunction

43 , mapFromJSONKeyFunction

46 , mapFromJSONKeyFunction

45− , GFromJSONKey()

46− , genericFromJSONKey

47−

48 -- * List functions

49 , listParser

@@ -118,9 +118,9 @@ import GHC.Generics

118import Numeric.Natural (Natural)

119import Text.ParserCombinators.ReadP (readP_to_S)

120import Unsafe.Coerce (unsafeCoerce)

121+import qualified Data.Aeson.Compat as Compat

121import qualified Data.Aeson.Parser.Time as Time

122import qualified Data.Aeson.Parser.Time as Time

122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)

123import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)

123−import qualified Data.ByteString.Lazy as L

124import qualified Data.DList as DList

125import qualified Data.HashMap.Strict as H

126import qualified Data.HashSet as HashSet

@@ -155,8 +155,18 @@ import qualified Data.Primitive.UnliftedArray as PM

155import qualified Data.Primitive.PrimArray as PM

156#endif

157

158+#ifndef HAS_COERCIBLE

159+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)

160+#endif

158

161

162+#if HAS_COERCIBLE

159import Data.Coerce (Coercible, coerce)

163import Data.Coerce (Coercible, coerce)

164+coerce' :: Coercible a b => a -> b

165+coerce' = coerce

166+#else

167+coerce' :: a -> b

168+coerce' = unsafeCoerce

169+#endif

160

170

161parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a

171parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a

162parseIndexedJSON p idx value = p value <?> Index idx

172parseIndexedJSON p idx value = p value <?> Index idx

@@ -396,16 +406,6 @@ class FromJSON a where

396-- > newtype SomeId = SomeId { getSomeId :: Text }

406-- > newtype SomeId = SomeId { getSomeId :: Text }

397-- > deriving (Eq,Ord,Hashable,FromJSONKey)

407-- > deriving (Eq,Ord,Hashable,FromJSONKey)

398--

408--

399−-- If you have a sum of nullary constructors, you may use the generic

400−-- implementation:

401−--

402−-- @

403−-- data Color = Red | Green | Blue

404−-- deriving Generic

405−--

406−-- instance 'FromJSONKey' Color where

407−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'

408−-- @

409class FromJSONKey a where

410 -- | Strategy for parsing the key of a map-like container.

411 fromJSONKey :: FromJSONKeyFunction a

@@ -428,7 +428,11 @@ class FromJSONKey a where

428-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'

429-- can be inspected, but cannot be constructed.

430data CoerceText a where

431+#if HAS_COERCIBLE

431 CoerceText :: Coercible Text a => CoerceText a

432 CoerceText :: Coercible Text a => CoerceText a

433+#else

434+ CoerceText :: CoerceText a

435+#endif

432

436

433-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the

437-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the

434-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'

438-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'

@@ -448,7 +452,7 @@ data FromJSONKeyFunction a

448

452

449-- | Only law abiding up to interpretation

453-- | Only law abiding up to interpretation

450instance Functor FromJSONKeyFunction where

454instance Functor FromJSONKeyFunction where

451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)

455+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')

452 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)

456 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)

453 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)

457 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)

454 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)

458 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)

@@ -462,7 +466,9 @@ instance Functor FromJSONKeyFunction where

462--

466--

463-- On pre GHC 7.8 this is unconstrainted function.

467-- On pre GHC 7.8 this is unconstrainted function.

464fromJSONKeyCoerce ::

468fromJSONKeyCoerce ::

469+#if HAS_COERCIBLE

465 Coercible Text a =>

470 Coercible Text a =>

471+#endif

466 FromJSONKeyFunction a

472 FromJSONKeyFunction a

467fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText

473fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText

468

474

@@ -470,52 +476,34 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText

470--

476--

471-- See note on 'fromJSONKeyCoerce'.

477-- See note on 'fromJSONKeyCoerce'.

472coerceFromJSONKeyFunction ::

478coerceFromJSONKeyFunction ::

479+#if HAS_COERCIBLE

473 Coercible a b =>

480 Coercible a b =>

481+#endif

474 FromJSONKeyFunction a -> FromJSONKeyFunction b

482 FromJSONKeyFunction a -> FromJSONKeyFunction b

483+#if HAS_COERCIBLE

475coerceFromJSONKeyFunction = coerce

484coerceFromJSONKeyFunction = coerce

485+#else

486+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText

487+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)

488+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)

489+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)

490+#endif

476

491

477{-# RULES

492{-# RULES

478 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).

493 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).

479 fmap id x = x

494 fmap id x = x

480 #-}

495 #-}

496+#if HAS_COERCIBLE

481{-# RULES

497{-# RULES

482 "FromJSONKeyCoerce: fmap coerce" forall x .

498 "FromJSONKeyCoerce: fmap coerce" forall x .

483 fmap coerce x = coerceFromJSONKeyFunction x

499 fmap coerce x = coerceFromJSONKeyFunction x

484 #-}

500 #-}

501+#endif

485

502

486-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.

503-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.

487mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b

504mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b

488mapFromJSONKeyFunction = fmap

505mapFromJSONKeyFunction = fmap

489

506

490−-- | 'fromJSONKey' for 'Generic' types.

491−-- These types must be sums of nullary constructors, whose names will be used

492−-- as keys for JSON objects.

493−--

494−-- See also 'genericToJSONKey'.

495−--

496−-- === __Example__

497−--

498−-- @

499−-- data Color = Red | Green | Blue

500−-- deriving 'Generic'

501−--

502−-- instance 'FromJSONKey' Color where

503−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'

504−-- @

505−genericFromJSONKey :: forall a. (Generic a, GFromJSONKey (Rep a))

506− => JSONKeyOptions

507− -> FromJSONKeyFunction a

508−genericFromJSONKey opts = FromJSONKeyTextParser $ \t ->

509− case parseSumFromString (keyModifier opts) t of

510− Nothing -> fail $

511− "invalid key " ++ show t ++ ", expected one of " ++ show cnames

512− Just k -> pure (to k)

513− where

514− cnames = unTagged2 (constructorTags (keyModifier opts) :: Tagged2 (Rep a) [String])

515−

516−class (ConstructorNames f, SumFromString f) => GFromJSONKey f where

517−instance (ConstructorNames f, SumFromString f) => GFromJSONKey f where

518−

519-------------------------------------------------------------------------------

507-------------------------------------------------------------------------------

520-- Functions needed for documentation

508-- Functions needed for documentation

521-------------------------------------------------------------------------------

509-------------------------------------------------------------------------------

@@ -768,13 +756,13 @@ withBoundedScientific' f v = withBoundedScientific_ id f v

768-- | A variant of 'withBoundedScientific_' parameterized by a function to apply

756-- | A variant of 'withBoundedScientific_' parameterized by a function to apply

769-- to the 'Parser' in case of failure.

757-- to the 'Parser' in case of failure.

770withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a

758withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a

771−withBoundedScientific_ whenFail f (Number scientific) =

759+withBoundedScientific_ whenFail f v@(Number scientific) =

772− if exp10 > 1024

760+ if exponent > 1024

773 then whenFail (fail msg)

761 then whenFail (fail msg)

774 else f scientific

762 else f scientific

775 where

763 where

776− exp10 = base10Exponent scientific

764+ exponent = base10Exponent scientific

777− msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"

765+ msg = "found a number with exponent " ++ show exponent ++ ", but it must not be greater than 1024"

778withBoundedScientific_ whenFail _ v =

766withBoundedScientific_ whenFail _ v =

779 whenFail (typeMismatch "Number" v)

767 whenFail (typeMismatch "Number" v)

780{-# INLINE withBoundedScientific_ #-}

768{-# INLINE withBoundedScientific_ #-}

@@ -794,7 +782,7 @@ withBool name _ v = prependContext name (typeMismatch "Boolean" v)

794-- | Decode a nested JSON-encoded string.

782-- | Decode a nested JSON-encoded string.

795withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a

783withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a

796withEmbeddedJSON _ innerParser (String txt) =

784withEmbeddedJSON _ innerParser (String txt) =

797− either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)

785+ either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)

798 where

786 where

799 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON

787 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON

800 eitherFormatError = either (Left . uncurry formatError) Right

788 eitherFormatError = either (Left . uncurry formatError) Right

@@ -863,7 +851,7 @@ parseFieldMaybe' = (.:!)

863-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@

851-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@

864explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a

852explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a

865explicitParseField p obj key = case H.lookup key obj of

853explicitParseField p obj key = case H.lookup key obj of

866− Nothing -> fail $ "key " ++ show key ++ " not found"

854+ Nothing -> fail $ "key " ++ show key ++ " not present"

867 Just v -> p v <?> Key key

855 Just v -> p v <?> Key key

868{-# INLINE explicitParseField #-}

856{-# INLINE explicitParseField #-}

869

857

@@ -922,16 +910,6 @@ type ConName = String

922contextType :: TypeName -> Parser a -> Parser a

910contextType :: TypeName -> Parser a -> Parser a

923contextType = prependContext

911contextType = prependContext

924

912

925−-- | Add the tagKey that will be looked up while building an ADT

926−-- | Produce the error equivalent to

927−-- | Left "Error in $: parsing T failed, expected an object with keys "tag" and

928−-- | "contents", where "tag" i-- |s associated to one of ["Foo", "Bar"],

929−-- | The parser returned error was: could not find key "tag"

930−contextTag :: Text -> [String] -> Parser a -> Parser a

931−contextTag tagKey cnames = prependFailure

932− ("expected Object with key \"" ++ unpack tagKey ++ "\"" ++

933− " containing one of " ++ show cnames ++ ", ")

934−

935-- | Add the name of the constructor being parsed to a parser's error messages.

913-- | Add the name of the constructor being parsed to a parser's error messages.

936contextCons :: ConName -> TypeName -> Parser a -> Parser a

914contextCons :: ConName -> TypeName -> Parser a -> Parser a

937contextCons cname tname = prependContext (showCons cname tname)

915contextCons cname tname = prependContext (showCons cname tname)

@@ -1042,46 +1020,41 @@ parseAllNullarySum :: (SumFromString f, ConstructorNames f)

1042parseAllNullarySum tname opts =

1020parseAllNullarySum tname opts =

1043 withText tname $ \tag ->

1021 withText tname $ \tag ->

1044 maybe (badTag tag) return $

1022 maybe (badTag tag) return $

1045− parseSumFromString modifier tag

1023+ parseSumFromString opts tag

1046 where

1024 where

1047− badTag tag = failWithCTags tname modifier $ \cnames ->

1025+ badTag tag = failWithCTags tname opts $ \cnames ->

1048 "expected one of the tags " ++ show cnames ++

1026 "expected one of the tags " ++ show cnames ++

1049 ", but found tag " ++ show tag

1027 ", but found tag " ++ show tag

1050− modifier = constructorTagModifier opts

1051

1028

1052-- | Fail with an informative error message about a mismatched tag.

1029-- | Fail with an informative error message about a mismatched tag.

1053-- The error message is parameterized by the list of expected tags,

1030-- The error message is parameterized by the list of expected tags,

1054-- to be inferred from the result type of the parser.

1031-- to be inferred from the result type of the parser.

1055failWithCTags

1032failWithCTags

1056− :: forall f a t. ConstructorNames f

1033+ :: forall f a. ConstructorNames f

1057− => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)

1034+ => TypeName -> Options -> ([String] -> String) -> Parser (f a)

1058−failWithCTags tname modifier f =

1035+failWithCTags tname opts f =

1059 contextType tname . fail $ f cnames

1036 contextType tname . fail $ f cnames

1060 where

1037 where

1061− cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])

1038+ cnames = unTagged2 (constructorTags opts :: Tagged2 f [String])

1062

1039

1063class SumFromString f where

1040class SumFromString f where

1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)

1041+ parseSumFromString :: Options -> Text -> Maybe (f a)

1065

1042

1066instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where

1043instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where

1067 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>

1044 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>

1068 (R1 <$> parseSumFromString opts key)

1045 (R1 <$> parseSumFromString opts key)

1069

1046

1070instance (Constructor c) => SumFromString (C1 c U1) where

1047instance (Constructor c) => SumFromString (C1 c U1) where

1071− parseSumFromString modifier key

1048+ parseSumFromString opts key | key == name = Just $ M1 U1

1072− | key == name = Just $ M1 U1

1073− | otherwise = Nothing

1049+ | otherwise = Nothing

1074− where

1050+ where

1051+ name = pack $ constructorTagModifier opts $

1075− name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)

1052+ conName (undefined :: M1 _i c _f _p)

1076−

1077−-- For genericFromJSONKey

1078−instance SumFromString a => SumFromString (D1 d a) where

1079− parseSumFromString modifier key = M1 <$> parseSumFromString modifier key

1080

1053

1081-- | List of all constructor tags.

1054-- | List of all constructor tags.

1082−constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]

1055+constructorTags :: ConstructorNames a => Options -> Tagged2 a [String]

1083−constructorTags modifier =

1056+constructorTags opts =

1084− fmap DList.toList (constructorNames' modifier)

1057+ fmap DList.toList (constructorNames' (constructorTagModifier opts))

1085

1058

1086-- | List of all constructor names of an ADT, after a given conversion

1059-- | List of all constructor names of an ADT, after a given conversion

1087-- function. (Better inlining.)

1060-- function. (Better inlining.)

@@ -1102,16 +1075,9 @@ instance Constructor c => ConstructorNames (C1 c a) where

1102 where

1075 where

1103 cname = conName (undefined :: M1 _i c _f _p)

1076 cname = conName (undefined :: M1 _i c _f _p)

1104

1077

1105−-- For genericFromJSONKey

1106−instance ConstructorNames a => ConstructorNames (D1 d a) where

1107− constructorNames' = retag . constructorNames'

1108− where

1109− retag :: Tagged2 a u -> Tagged2 (D1 d a) u

1110− retag (Tagged2 x) = Tagged2 x

1111−

1112--------------------------------------------------------------------------------

1078--------------------------------------------------------------------------------

1079+

1113−parseNonAllNullarySum :: forall f c arity.

1080+parseNonAllNullarySum :: ( FromPair arity f

1114− ( FromPair arity f

1115 , FromTaggedObject arity f

1081 , FromTaggedObject arity f

1116 , FromUntaggedValue arity f

1082 , FromUntaggedValue arity f

1117 , ConstructorNames f

1083 , ConstructorNames f

@@ -1121,7 +1087,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =

1121 case sumEncoding opts of

1087 case sumEncoding opts of

1122 TaggedObject{..} ->

1088 TaggedObject{..} ->

1123 withObject tname $ \obj -> do

1089 withObject tname $ \obj -> do

1124− tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey

1090+ tag <- contextType tname $ obj .: tagKey

1125 fromMaybe (badTag tag <?> Key tagKey) $

1091 fromMaybe (badTag tag <?> Key tagKey) $

1126 parseFromTaggedObject (tag :* contentsFieldName :* p) obj

1092 parseFromTaggedObject (tag :* contentsFieldName :* p) obj

1127 where

1093 where

@@ -1129,7 +1095,6 @@ parseNonAllNullarySum p@(tname :* opts :* _) =

1129 badTag tag = failWith_ $ \cnames ->

1095 badTag tag = failWith_ $ \cnames ->

1130 "expected tag field to be one of " ++ show cnames ++

1096 "expected tag field to be one of " ++ show cnames ++

1131 ", but found tag " ++ show tag

1097 ", but found tag " ++ show tag

1132− cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])

1133

1098

1134 ObjectWithSingleField ->

1099 ObjectWithSingleField ->

1135 withObject tname $ \obj -> case H.toList obj of

1100 withObject tname $ \obj -> case H.toList obj of

@@ -1161,7 +1126,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =

1161

1126

1162 UntaggedValue -> parseUntaggedValue p

1127 UntaggedValue -> parseUntaggedValue p

1163 where

1128 where

1164− failWith_ = failWithCTags tname (constructorTagModifier opts)

1129+ failWith_ = failWithCTags tname opts

1165

1130

1166--------------------------------------------------------------------------------

1131--------------------------------------------------------------------------------

1167

1132

@@ -1201,9 +1166,9 @@ class FromTaggedObject' arity f isRecord where

1201 :: String :* ConName :* TypeName :* Options :* FromArgs arity a

1166 :: String :* ConName :* TypeName :* Options :* FromArgs arity a

1202 -> Object -> Tagged isRecord (Parser (f a))

1167 -> Object -> Tagged isRecord (Parser (f a))

1203

1168

1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where

1169+instance (RecordFromJSON arity f) => FromTaggedObject' arity f True where

1205 -- Records are unpacked in the tagged object

1170 -- Records are unpacked in the tagged object

1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)

1171+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON p

1207

1172

1208instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where

1173instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where

1209 -- Nonnullary nonrecords are encoded in the contents field

1174 -- Nonnullary nonrecords are encoded in the contents field

@@ -1244,11 +1209,11 @@ instance OVERLAPPING_

1244 ) => ConsFromJSON' arity (S1 s a) True where

1209 ) => ConsFromJSON' arity (S1 s a) True where

1245 consParseJSON' p@(cname :* tname :* opts :* fargs)

1210 consParseJSON' p@(cname :* tname :* opts :* fargs)

1246 | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs

1211 | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs

1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))

1212+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON p)

1248

1213

1249instance RecordFromJSON arity f => ConsFromJSON' arity f True where

1214instance RecordFromJSON arity f => ConsFromJSON' arity f True where

1250 consParseJSON' p@(cname :* tname :* _) =

1215 consParseJSON' p@(cname :* tname :* _) =

1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))

1216+ Tagged . withObject (showCons cname tname) (recordParseJSON p)

1252

1217

1253instance OVERLAPPING_

1218instance OVERLAPPING_

1254 ConsFromJSON' arity U1 False where

1219 ConsFromJSON' arity U1 False where

@@ -1274,55 +1239,21 @@ instance (ProductFromJSON arity f, ProductSize f

1274

1239

1275--------------------------------------------------------------------------------

1240--------------------------------------------------------------------------------

1276

1241

1277−class FieldNames f where

1278− fieldNames :: f a -> [Text] -> [Text]

1279−

1280−instance (FieldNames a, FieldNames b) => FieldNames (a :*: b) where

1281− fieldNames _ =

1282− fieldNames (undefined :: a x) .

1283− fieldNames (undefined :: b y)

1284−

1285−instance (Selector s) => FieldNames (S1 s f) where

1286− fieldNames _ = (pack (selName (undefined :: M1 _i s _f _p)) :)

1287−

1288class RecordFromJSON arity f where

1242class RecordFromJSON arity f where

1289 recordParseJSON

1243 recordParseJSON

1290− :: Bool :* ConName :* TypeName :* Options :* FromArgs arity a

1291− -> Object -> Parser (f a)

1292−

1293−instance ( FieldNames f

1294− , RecordFromJSON' arity f

1295− ) => RecordFromJSON arity f where

1296− recordParseJSON (fromTaggedSum :* p@(cname :* tname :* opts :* _)) =

1297− \obj -> checkUnknown obj >> recordParseJSON' p obj

1298− where

1299− knownFields :: H.HashMap Text ()

1300− knownFields = H.fromList $ map (,()) $

1301− fieldNames (undefined :: f a)

1302− [pack (tagFieldName (sumEncoding opts)) | fromTaggedSum]

1303− checkUnknown =

1304− if not (rejectUnknownFields opts)

1305− then \_ -> return ()

1306− else \obj -> case H.keys (H.difference obj knownFields) of

1307− [] -> return ()

1308− unknownFields -> contextCons cname tname $

1309− fail ("unknown fields: " ++ show unknownFields)

1310−

1311−class RecordFromJSON' arity f where

1312− recordParseJSON'

1313 :: ConName :* TypeName :* Options :* FromArgs arity a

1244 :: ConName :* TypeName :* Options :* FromArgs arity a

1314 -> Object -> Parser (f a)

1245 -> Object -> Parser (f a)

1315

1246

1316−instance ( RecordFromJSON' arity a

1247+instance ( RecordFromJSON arity a

1317− , RecordFromJSON' arity b

1248+ , RecordFromJSON arity b

1318− ) => RecordFromJSON' arity (a :*: b) where

1249+ ) => RecordFromJSON arity (a :*: b) where

1319− recordParseJSON' p obj =

1250+ recordParseJSON p obj =

1320− (:*:) <$> recordParseJSON' p obj

1251+ (:*:) <$> recordParseJSON p obj

1321− <*> recordParseJSON' p obj

1252+ <*> recordParseJSON p obj

1322

1253

1323instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>

1254instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>

1324− RecordFromJSON' arity (S1 s a) where

1255+ RecordFromJSON arity (S1 s a) where

1325− recordParseJSON' (cname :* tname :* opts :* fargs) obj = do

1256+ recordParseJSON (cname :* tname :* opts :* fargs) obj = do

1326 fv <- contextCons cname tname (obj .: label)

1257 fv <- contextCons cname tname (obj .: label)

1327 M1 <$> gParseJSON opts fargs fv <?> Key label

1258 M1 <$> gParseJSON opts fargs fv <?> Key label

1328 where

1259 where

@@ -1330,16 +1261,16 @@ instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>

1330 sname = selName (undefined :: M1 _i s _f _p)

1261 sname = selName (undefined :: M1 _i s _f _p)

1331

1262

1332instance INCOHERENT_ (Selector s, FromJSON a) =>

1263instance INCOHERENT_ (Selector s, FromJSON a) =>

1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where

1264+ RecordFromJSON arity (S1 s (K1 i (Maybe a))) where

1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label

1265+ recordParseJSON (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label

1335 where

1266 where

1336 label = fieldLabelModifier opts sname

1267 label = fieldLabelModifier opts sname

1337 sname = selName (undefined :: M1 _i s _f _p)

1268 sname = selName (undefined :: M1 _i s _f _p)

1338

1269

1339-- Parse an Option like a Maybe.

1270-- Parse an Option like a Maybe.

1340instance INCOHERENT_ (Selector s, FromJSON a) =>

1271instance INCOHERENT_ (Selector s, FromJSON a) =>

1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where

1272+ RecordFromJSON arity (S1 s (K1 i (Semigroup.Option a))) where

1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj

1273+ recordParseJSON p obj = wrap <$> recordParseJSON p obj

1343 where

1274 where

1344 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p

1275 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p

1345 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))

1276 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))

@@ -1576,22 +1507,12 @@ instance FromJSONKey Float where

1576 _ -> Scientific.toRealFloat <$> parseScientificText t

1507 _ -> Scientific.toRealFloat <$> parseScientificText t

1577

1508

1578instance (FromJSON a, Integral a) => FromJSON (Ratio a) where

1509instance (FromJSON a, Integral a) => FromJSON (Ratio a) where

1579− parseJSON (Number x)

1580− | exp10 <= 1024

1581− , exp10 >= -1024 = return $! realToFrac x

1582− | otherwise = prependContext "Ratio" $ fail msg

1583− where

1584− exp10 = base10Exponent x

1585− msg = "found a number with exponent " ++ show exp10

1586− ++ ", but it must not be greater than 1024 or less than -1024"

1587− parseJSON o = objParser o

1588− where

1589− objParser = withObject "Rational" $ \obj -> do

1510+ parseJSON = withObject "Rational" $ \obj -> do

1590− numerator <- obj .: "numerator"

1511+ numerator <- obj .: "numerator"

1591− denominator <- obj .: "denominator"

1512+ denominator <- obj .: "denominator"

1592− if denominator == 0

1513+ if denominator == 0

1593− then fail "Ratio denominator was 0"

1514+ then fail "Ratio denominator was 0"

1594− else pure $ numerator % denominator

1515+ else pure $ numerator % denominator

1595 {-# INLINE parseJSON #-}

1516 {-# INLINE parseJSON #-}

1596

1517

1597-- | This instance includes a bounds check to prevent maliciously

1518-- | This instance includes a bounds check to prevent maliciously

@@ -2006,6 +1927,7 @@ instance FromJSON DotNetTime where

2006-- primitive

1927-- primitive

2007-------------------------------------------------------------------------------

1928-------------------------------------------------------------------------------

2008

1929

1930+#if MIN_VERSION_base(4,7,0)

2009instance FromJSON a => FromJSON (PM.Array a) where

1931instance FromJSON a => FromJSON (PM.Array a) where

2010 -- note: we could do better than this if vector exposed the data

1932 -- note: we could do better than this if vector exposed the data

2011 -- constructor in Data.Vector.

1933 -- constructor in Data.Vector.

@@ -2023,6 +1945,7 @@ instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where

2023 parseJSON = fmap Exts.fromList . parseJSON

1945 parseJSON = fmap Exts.fromList . parseJSON

2024#endif

1946#endif

2025#endif

1947#endif

1948+#endif

2026

1949

2027-------------------------------------------------------------------------------

1950-------------------------------------------------------------------------------

2028-- time

1951-- time

Data/Aeson/Types/Internal.hs+5−65

@@ -49,8 +49,6 @@ module Data.Aeson.Types.Internal

49 , parserThrowError

50 , parserCatchError

51 , formatError

52− , formatPath

53− , formatRelativePath

54 , (<?>)

52 , (<?>)

55 -- * Constructors and accessors

53 -- * Constructors and accessors

56 , object

54 , object

@@ -64,14 +62,11 @@ module Data.Aeson.Types.Internal

64 , sumEncoding

62 , sumEncoding

65 , unwrapUnaryRecords

63 , unwrapUnaryRecords

66 , tagSingleConstructors

64 , tagSingleConstructors

67− , rejectUnknownFields

68 )

65 )

70 , SumEncoding(..)

67 , SumEncoding(..)

71− , JSONKeyOptions(keyModifier)

72 , defaultOptions

68 , defaultOptions

73 , defaultTaggedObject

69 , defaultTaggedObject

74− , defaultJSONKeyOptions

76 -- * Used for changing CamelCase names into something else.

71 -- * Used for changing CamelCase names into something else.

77 , camelTo

72 , camelTo

@@ -102,7 +97,6 @@ import Data.Time.Format (FormatTime)

102import Data.Typeable (Typeable)

97import Data.Typeable (Typeable)

103import Data.Vector (Vector)

98import Data.Vector (Vector)

104import GHC.Generics (Generic)

99import GHC.Generics (Generic)

105−import qualified Control.Monad as Monad

106import qualified Control.Monad.Fail as Fail

100import qualified Control.Monad.Fail as Fail

107import qualified Data.HashMap.Strict as H

101import qualified Data.HashMap.Strict as H

108import qualified Data.Scientific as S

102import qualified Data.Scientific as S

@@ -156,7 +150,7 @@ instance Functor Result where

156 fmap _ (Error err) = Error err

150 fmap _ (Error err) = Error err

157 {-# INLINE fmap #-}

151 {-# INLINE fmap #-}

158

152

159−instance Monad.Monad IResult where

153+instance Monad IResult where

160 return = pure

154 return = pure

161 {-# INLINE return #-}

155 {-# INLINE return #-}

162

156

@@ -173,7 +167,7 @@ instance Fail.MonadFail IResult where

173 fail err = IError [] err

167 fail err = IError [] err

174 {-# INLINE fail #-}

168 {-# INLINE fail #-}

175

169

176−instance Monad.Monad Result where

170+instance Monad Result where

177 return = pure

171 return = pure

178 {-# INLINE return #-}

172 {-# INLINE return #-}

179

173

@@ -292,7 +286,7 @@ newtype Parser a = Parser {

292 -> f r

286 -> f r

293 }

287 }

294

288

295−instance Monad.Monad Parser where

289+instance Monad Parser where

296 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks

290 m >>= g = Parser $ \path kf ks -> let ks' a = runParser (g a) path kf ks

297 in runParser m path kf ks'

291 in runParser m path kf ks'

298 {-# INLINE (>>=) #-}

292 {-# INLINE (>>=) #-}

@@ -461,17 +455,7 @@ parseEither m v = runParser (m v) [] onError Right

461-- | Annotate an error message with a

455-- | Annotate an error message with a

462-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.

456-- <http://goessner.net/articles/JsonPath/ JSONPath> error location.

463formatError :: JSONPath -> String -> String

457formatError :: JSONPath -> String -> String

464−formatError path msg = "Error in " ++ formatPath path ++ ": " ++ msg

458+formatError path msg = "Error in " ++ format "$" path ++ ": " ++ msg

465−

466−-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String',

467−-- representing the root object as @$@.

468−formatPath :: JSONPath -> String

469−formatPath path = "$" ++ formatRelativePath path

470−

471−-- | Format a <http://goessner.net/articles/JsonPath/ JSONPath> as a 'String'

472−-- which represents the path relative to some root object.

473−formatRelativePath :: JSONPath -> String

474−formatRelativePath path = format "" path

475 where

459 where

476 format :: String -> JSONPath -> String

460 format :: String -> JSONPath -> String

477 format pfx [] = pfx

461 format pfx [] = pfx

@@ -625,14 +609,10 @@ data Options = Options

625 , tagSingleConstructors :: Bool

609 , tagSingleConstructors :: Bool

626 -- ^ Encode types with a single constructor as sums,

610 -- ^ Encode types with a single constructor as sums,

627 -- so that `allNullaryToStringTag` and `sumEncoding` apply.

611 -- so that `allNullaryToStringTag` and `sumEncoding` apply.

628− , rejectUnknownFields :: Bool

629− -- ^ Applies only to 'Data.Aeson.FromJSON' instances. If a field appears in

630− -- the parsed object map, but does not appear in the target object, parsing

631− -- will fail, with an error message indicating which fields were unknown.

632 }

612 }

633

613

634instance Show Options where

614instance Show Options where

635− show (Options f c a o s u t r) =

615+ show (Options f c a o s u t) =

636 "Options {"

616 "Options {"

637 ++ intercalate ", "

617 ++ intercalate ", "

638 [ "fieldLabelModifier =~ " ++ show (f "exampleField")

618 [ "fieldLabelModifier =~ " ++ show (f "exampleField")

@@ -642,7 +622,6 @@ instance Show Options where

642 , "sumEncoding = " ++ show s

622 , "sumEncoding = " ++ show s

643 , "unwrapUnaryRecords = " ++ show u

623 , "unwrapUnaryRecords = " ++ show u

644 , "tagSingleConstructors = " ++ show t

624 , "tagSingleConstructors = " ++ show t

645− , "rejectUnknownFields = " ++ show r

646 ]

625 ]

647 ++ "}"

626 ++ "}"

648

627

@@ -686,33 +665,6 @@ data SumEncoding =

686 -- contents of the constructor.

665 -- contents of the constructor.

687 deriving (Eq, Show)

666 deriving (Eq, Show)

688

667

689−-- | Options for encoding keys with 'Data.Aeson.Types.genericFromJSONKey' and

690−-- 'Data.Aeson.Types.genericToJSONKey'.

691−data JSONKeyOptions = JSONKeyOptions

692− { keyModifier :: String -> String

693− -- ^ Function applied to keys. Its result is what goes into the encoded

694− -- 'Value'.

695− --

696− -- === __Example__

697− --

698− -- The following instances encode the constructor @Bar@ to lower-case keys

699− -- @\"bar\"@.

700− --

701− -- @

702− -- data Foo = Bar

703− -- deriving 'Generic'

704− --

705− -- opts :: 'JSONKeyOptions'

706− -- opts = 'defaultJSONKeyOptions' { 'keyModifier' = 'toLower' }

707− --

708− -- instance 'ToJSONKey' Foo where

709− -- 'toJSONKey' = 'genericToJSONKey' opts

710− --

711− -- instance 'FromJSONKey' Foo where

712− -- 'fromJSONKey' = 'genericFromJSONKey' opts

713− -- @

714− }

715−

716-- | Default encoding 'Options':

668-- | Default encoding 'Options':

717--

669--

718-- @

670-- @

@@ -724,7 +676,6 @@ data JSONKeyOptions = JSONKeyOptions

724-- , 'sumEncoding' = 'defaultTaggedObject'

676-- , 'sumEncoding' = 'defaultTaggedObject'

725-- , 'unwrapUnaryRecords' = False

677-- , 'unwrapUnaryRecords' = False

726-- , 'tagSingleConstructors' = False

678-- , 'tagSingleConstructors' = False

727−-- , 'rejectUnknownFields' = False

728-- }

679-- }

729-- @

680-- @

730defaultOptions :: Options

681defaultOptions :: Options

@@ -736,7 +687,6 @@ defaultOptions = Options

736 , sumEncoding = defaultTaggedObject

687 , sumEncoding = defaultTaggedObject

737 , unwrapUnaryRecords = False

688 , unwrapUnaryRecords = False

738 , tagSingleConstructors = False

689 , tagSingleConstructors = False

739− , rejectUnknownFields = False

740 }

690 }

741

691

742-- | Default 'TaggedObject' 'SumEncoding' options:

692-- | Default 'TaggedObject' 'SumEncoding' options:

@@ -753,16 +703,6 @@ defaultTaggedObject = TaggedObject

753 , contentsFieldName = "contents"

703 , contentsFieldName = "contents"

754 }

704 }

755

705

756−-- | Default 'JSONKeyOptions':

757−--

758−-- @

759−-- defaultJSONKeyOptions = 'JSONKeyOptions'

760−-- { 'keyModifier' = 'id'

761−-- }

762−-- @

763−defaultJSONKeyOptions :: JSONKeyOptions

764−defaultJSONKeyOptions = JSONKeyOptions id

765−

766-- | Converts from CamelCase to another lower case, interspersing

706-- | Converts from CamelCase to another lower case, interspersing

767-- the character between all capital letters and their previous

707-- the character between all capital letters and their previous

768-- entries, except those capital letters that appear together,

708-- entries, except those capital letters that appear together,

Data/Aeson/Types/ToJSON.hs+46−46

@@ -5,15 +5,19 @@

5{-# LANGUAGE FlexibleInstances #-}

6{-# LANGUAGE FunctionalDependencies #-}

7{-# LANGUAGE GADTs #-}

8+{-# LANGUAGE NamedFieldPuns #-}

8{-# LANGUAGE NoImplicitPrelude #-}

9{-# LANGUAGE NoImplicitPrelude #-}

9{-# LANGUAGE OverloadedStrings #-}

10{-# LANGUAGE OverloadedStrings #-}

10{-# LANGUAGE PatternGuards #-}

11{-# LANGUAGE PatternGuards #-}

11−{-# LANGUAGE PolyKinds #-}

12{-# LANGUAGE RecordWildCards #-}

13{-# LANGUAGE ScopedTypeVariables #-}

14{-# LANGUAGE TypeOperators #-}

15{-# LANGUAGE UndecidableInstances #-}

17+#if __GLASGOW_HASKELL__ >= 706

18+{-# LANGUAGE PolyKinds #-}

19+#endif

20+

17#include "overlapping-compat.h"

21#include "overlapping-compat.h"

18#include "incoherent-compat.h"

22#include "incoherent-compat.h"

@@ -43,10 +47,6 @@ module Data.Aeson.Types.ToJSON

43 , ToJSONKeyFunction(..)

47 , ToJSONKeyFunction(..)

44 , toJSONKeyText

48 , toJSONKeyText

45 , contramapToJSONKeyFunction

49 , contramapToJSONKeyFunction

46−

47− , GToJSONKey()

48− , genericToJSONKey

49−

50 -- * Object key-value pairs

51 , KeyValue(..)

52 , KeyValuePair(..)

@@ -100,6 +100,7 @@ import GHC.Generics

100import Numeric.Natural (Natural)

101import qualified Data.Aeson.Encoding as E

102import qualified Data.Aeson.Encoding.Internal as E (InArray, comma, econcat, retagEncoding)

103+import qualified Data.ByteString as S

103import qualified Data.ByteString.Lazy as L

104import qualified Data.ByteString.Lazy as L

104import qualified Data.DList as DList

105import qualified Data.DList as DList

105import qualified Data.HashMap.Strict as H

106import qualified Data.HashMap.Strict as H

@@ -140,6 +141,14 @@ import qualified Data.Primitive.UnliftedArray as PM

140import qualified Data.Primitive.PrimArray as PM

141import qualified Data.Primitive.PrimArray as PM

141#endif

142#endif

142

143

144+#if !(MIN_VERSION_bytestring(0,10,0))

145+import Foreign.ForeignPtr (withForeignPtr)

146+import Foreign.Marshal.Utils (copyBytes)

147+import Foreign.Ptr (plusPtr)

148+import qualified Data.ByteString.Internal as S

149+import qualified Data.ByteString.Lazy.Internal as L

150+#endif

151+

143toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value

152toJSONPair :: (a -> Value) -> (b -> Value) -> (a, b) -> Value

144toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)

153toJSONPair a b = liftToJSON2 a (listValue a) b (listValue b)

145{-# INLINE toJSONPair #-}

154{-# INLINE toJSONPair #-}

@@ -402,7 +411,7 @@ instance KeyValue Object where

402-- newtype wrapper around 'Text'. The recommended approach is to use

411-- newtype wrapper around 'Text'. The recommended approach is to use

403-- generalized newtype deriving:

412-- generalized newtype deriving:

404--

413--

405−-- > newtype RecordId = RecordId { getRecordId :: Text }

414+-- > newtype RecordId = RecordId { getRecordId :: Text}

406-- > deriving (Eq,Ord,ToJSONKey)

415-- > deriving (Eq,Ord,ToJSONKey)

407--

416--

408-- Then we may write:

417-- Then we may write:

@@ -417,18 +426,8 @@ instance KeyValue Object where

417--

426--

418-- It is possible to get the 'ToJSONKey' instance for free as we did

427-- It is possible to get the 'ToJSONKey' instance for free as we did

419-- with 'Foo'. However, in this case, we have a natural way to go to

428-- with 'Foo'. However, in this case, we have a natural way to go to

420−-- and from 'Text' that does not require any escape sequences. So

429+-- and from 'Text' that does not require any escape sequences. So, in

421−-- 'ToJSONKeyText' can be used instead of 'ToJSONKeyValue' to encode maps

430+-- this example, 'ToJSONKeyText' will be used instead of 'ToJSONKeyValue'.

422−-- as objects instead of arrays of pairs. This instance may be

423−-- implemented using generics as follows:

424−--

425−-- @

426−-- instance 'ToJSONKey' Color where

427−-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'

428−-- @

429−--

430−-- === __Low-level implementations__

431−--

432-- The 'Show' instance can be used to help write 'ToJSONKey':

431-- The 'Show' instance can be used to help write 'ToJSONKey':

433--

432--

434-- > instance ToJSONKey Color where

433-- > instance ToJSONKey Color where

@@ -503,7 +502,7 @@ toJSONKeyTextEnc e = ToJSONKeyText tot e

503 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm

502 -- TODO: dropAround is also used in stringEncoding, which is unfortunate atm

504 tot = T.dropAround (== '"')

503 tot = T.dropAround (== '"')

505 . T.decodeLatin1

504 . T.decodeLatin1

506− . L.toStrict

505+ . lazyToStrictByteString

507 . E.encodingToLazyByteString

506 . E.encodingToLazyByteString

508 . e

507 . e

509

508

@@ -516,29 +515,6 @@ contramapToJSONKeyFunction h x = case x of

516 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)

515 ToJSONKeyText f g -> ToJSONKeyText (f . h) (g . h)

517 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)

516 ToJSONKeyValue f g -> ToJSONKeyValue (f . h) (g . h)

518

517

519−-- 'toJSONKey' for 'Generic' types.

520−-- Deriving is supported for enumeration types, i.e. the sums of nullary

521−-- constructors. The names of constructors will be used as keys for JSON

522−-- objects.

523−--

524−-- See also 'genericFromJSONKey'.

525−--

526−-- === __Example__

527−--

528−-- @

529−-- data Color = Red | Green | Blue

530−-- deriving 'Generic'

531−--

532−-- instance 'ToJSONKey' Color where

533−-- 'toJSONKey' = 'genericToJSONKey' 'defaultJSONKeyOptions'

534−-- @

535−genericToJSONKey :: (Generic a, GToJSONKey (Rep a))

536− => JSONKeyOptions -> ToJSONKeyFunction a

537−genericToJSONKey opts = toJSONKeyText (pack . keyModifier opts . getConName . from)

538−

539−class GetConName f => GToJSONKey f

540−instance GetConName f => GToJSONKey f

541−

542-------------------------------------------------------------------------------

518-------------------------------------------------------------------------------

543-- Lifings of FromJSON and ToJSON to unary and binary type constructors

519-- Lifings of FromJSON and ToJSON to unary and binary type constructors

544-------------------------------------------------------------------------------

520-------------------------------------------------------------------------------

@@ -968,9 +944,6 @@ instance (GetConName a, GetConName b) => GetConName (a :+: b) where

968instance (Constructor c) => GetConName (C1 c a) where

944instance (Constructor c) => GetConName (C1 c a) where

969 getConName = conName

945 getConName = conName

970

946

971−-- For genericToJSONKey

972−instance GetConName a => GetConName (D1 d a) where

973− getConName (M1 x) = getConName x

974

947

975--------------------------------------------------------------------------------

948--------------------------------------------------------------------------------

976

949

@@ -1970,6 +1943,7 @@ formatMillis = take 3 . formatTime defaultTimeLocale "%q"

1970-- primitive

1943-- primitive

1971-------------------------------------------------------------------------------

1944-------------------------------------------------------------------------------

1972

1945

1946+#if MIN_VERSION_base(4,7,0)

1973instance ToJSON a => ToJSON (PM.Array a) where

1947instance ToJSON a => ToJSON (PM.Array a) where

1974 -- note: we could do better than this if vector exposed the data

1948 -- note: we could do better than this if vector exposed the data

1975 -- constructor in Data.Vector.

1949 -- constructor in Data.Vector.

@@ -1991,6 +1965,7 @@ instance (PM.PrimUnlifted a,ToJSON a) => ToJSON (PM.UnliftedArray a) where

1991 toEncoding = toEncoding . Exts.toList

1965 toEncoding = toEncoding . Exts.toList

1992#endif

1966#endif

1993#endif

1967#endif

1968+#endif

1994

1969

1995-------------------------------------------------------------------------------

1970-------------------------------------------------------------------------------

1996-- time

1971-- time

@@ -2040,7 +2015,7 @@ stringEncoding :: Encoding' Text -> Value

2040stringEncoding = String

2015stringEncoding = String

2041 . T.dropAround (== '"')

2016 . T.dropAround (== '"')

2042 . T.decodeLatin1

2017 . T.decodeLatin1

2043− . L.toStrict

2018+ . lazyToStrictByteString

2044 . E.encodingToLazyByteString

2019 . E.encodingToLazyByteString

2045{-# INLINE stringEncoding #-}

2020{-# INLINE stringEncoding #-}

2046

2021

@@ -2847,6 +2822,31 @@ instance (ToJSON a, ToJSON b, ToJSON c, ToJSON d, ToJSON e, ToJSON f, ToJSON g,

2847 toEncoding = toEncoding2

2822 toEncoding = toEncoding2

2848 {-# INLINE toEncoding #-}

2823 {-# INLINE toEncoding #-}

2849

2824

2825+-------------------------------------------------------------------------------

2826+-- pre-bytestring-0.10 compatibility

2827+-------------------------------------------------------------------------------

2828+

2829+{-# INLINE lazyToStrictByteString #-}

2830+lazyToStrictByteString :: L.ByteString -> S.ByteString

2831+#if MIN_VERSION_bytestring(0,10,0)

2832+lazyToStrictByteString = L.toStrict

2833+#else

2834+lazyToStrictByteString = packChunks

2835+

2836+-- packChunks is taken from the blaze-builder package.

2837+

2838+-- | Pack the chunks of a lazy bytestring into a single strict bytestring.

2839+packChunks :: L.ByteString -> S.ByteString

2840+packChunks lbs =

2841+ S.unsafeCreate (fromIntegral $ L.length lbs) (copyChunks lbs)

2842+ where

2843+ copyChunks L.Empty _pf = return ()

2844+ copyChunks (L.Chunk (S.PS fpbuf o l) lbs') pf = do

2845+ withForeignPtr fpbuf $ \pbuf ->

2846+ copyBytes pf (pbuf `plusPtr` o) l

2847+ copyChunks lbs' (pf `plusPtr` l)

2848+#endif

2849+

2850--------------------------------------------------------------------------------

2851

2852-- | Wrap a list of pairs as an object.

Makefile+1−1

@@ -1,2 +1,2 @@

1lint:

2− ./run-hlint.sh --cpp-include include/ --cpp-file travis/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/

2+ hlint --cpp-include include/ --cpp-file .stack-work/dist/*/*Cabal-*/build/autogen/cabal_macros.h Data/ attoparsec-iso8601/ benchmarks/ examples/ ffi/ pure/ tests/

aeson.cabal+16−9

@@ -1,5 +1,5 @@

1name: aeson

2−version: 1.4.6.0

2+version: 1.4.3.0

3license: BSD3

4license-file: LICENSE

5category: Text, Web, JSON

@@ -88,6 +88,7 @@ library

88 Data.Aeson.Encode

90 other-modules:

91+ Data.Aeson.Compat

91 Data.Aeson.Encoding.Builder

92 Data.Aeson.Encoding.Builder

92 Data.Aeson.Internal.Functions

93 Data.Aeson.Internal.Functions

93 Data.Aeson.Parser.Unescape

94 Data.Aeson.Parser.Unescape

@@ -102,23 +103,28 @@ library

102

103

103 -- GHC bundled libs

104 -- GHC bundled libs

104 build-depends:

105 build-depends:

105− base >= 4.7.0.0 && < 5,

106+ base >= 4.5.0.0 && < 5,

106− bytestring >= 0.10.4.0 && < 0.11,

107− containers >= 0.5.5.1 && < 0.7,

107+ containers >= 0.4.2.1 && < 0.7,

108 deepseq >= 1.3.0.0 && < 1.5,

109 ghc-prim >= 0.2 && < 0.6,

110− template-haskell >= 2.9.0.0 && < 2.16,

110+ template-haskell >= 2.7.0.0 && < 2.15,

111 text >= 1.2.3.0 && < 1.3,

112− time >= 1.4 && < 1.10

112+ time >= 1.4 && < 1.9

113

114 if impl(ghc >= 8.0)

115 build-depends: bytestring >= 0.10.8.1

116

117 -- Compat

118 build-depends:

119− base-compat >= 0.9.1 && < 0.12,

119+ base-compat >= 0.9.1 && < 0.11,

120 time-compat >= 1.9.2.2 && < 1.10

121

122+ if flag(bytestring-builder)

123+ build-depends: bytestring >= 0.9.2.1 && < 0.10.4,

124+ bytestring-builder >= 0.10.4 && < 1

125+ else

126+ build-depends: bytestring >= 0.10.4 && < 0.11

127+

122 if !impl(ghc >= 8.6)

128 if !impl(ghc >= 8.6)

123 build-depends:

129 build-depends:

124 contravariant >=1.4.1 && <1.6

130 contravariant >=1.4.1 && <1.6

@@ -151,6 +157,7 @@ library

151 hashable >= 1.2.7.0 && < 1.4,

157 hashable >= 1.2.7.0 && < 1.4,

152 scientific >= 0.3.6.2 && < 0.4,

158 scientific >= 0.3.6.2 && < 0.4,

153 th-abstraction >= 0.2.8.0 && < 0.4,

159 th-abstraction >= 0.2.8.0 && < 0.4,

160+ time-locale-compat >= 0.1.1.5 && < 0.2,

154 uuid-types >= 1.0.3 && < 1.1,

161 uuid-types >= 1.0.3 && < 1.1,

155 vector >= 0.12.0.1 && < 0.13

162 vector >= 0.12.0.1 && < 0.13

156

163

@@ -219,9 +226,9 @@ test-suite tests

219 containers,

226 containers,

220 directory,

227 directory,

221 dlist,

228 dlist,

222− Diff >= 0.4 && < 0.5,

229+ Diff,

223 filepath,

230 filepath,

224− generic-deriving >= 1.10 && < 1.14,

231+ generic-deriving >= 1.10 && < 1.13,

225 ghc-prim >= 0.2,

232 ghc-prim >= 0.2,

226 hashable >= 1.2.4.0,

233 hashable >= 1.2.4.0,

227 scientific,

234 scientific,

attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+20

@@ -29,8 +29,16 @@ import Data.Time.Clock (diffTimeToPicoseconds)

30#endif

32+#if MIN_VERSION_base(4,7,0)

33+

32import Data.Fixed (Pico, Fixed(MkFixed))

34import Data.Fixed (Pico, Fixed(MkFixed))

36+#else

37+

38+import Data.Fixed (Pico)

39+

40+#endif

41+

34#if !MIN_VERSION_time(1,6,0)

42#if !MIN_VERSION_time(1,6,0)

36diffTimeToPicoseconds :: DiffTime -> Integer

44diffTimeToPicoseconds :: DiffTime -> Integer

@@ -38,12 +46,24 @@ diffTimeToPicoseconds = unsafeCoerce

39#endif

47#endif

49+#if MIN_VERSION_base(4,7,0)

50+

41toPico :: Integer -> Pico

51toPico :: Integer -> Pico

42toPico = MkFixed

52toPico = MkFixed

44fromPico :: Pico -> Integer

54fromPico :: Pico -> Integer

45fromPico (MkFixed i) = i

55fromPico (MkFixed i) = i

57+#else

58+

59+toPico :: Integer -> Pico

60+toPico = unsafeCoerce

61+

62+fromPico :: Pico -> Integer

63+fromPico = unsafeCoerce

64+

65+#endif

66+

47-- | Like TimeOfDay, but using a fixed-width integer for seconds.

67-- | Like TimeOfDay, but using a fixed-width integer for seconds.

48data TimeOfDay64 = TOD {-# UNPACK #-} !Int

68data TimeOfDay64 = TOD {-# UNPACK #-} !Int

49 {-# UNPACK #-} !Int

69 {-# UNPACK #-} !Int

attoparsec-iso8601/attoparsec-iso8601.cabal+2−2

@@ -36,8 +36,8 @@ library

36 Data.Attoparsec.Time

37 build-depends:

38 attoparsec >= 0.13.0.1,

39− base >= 4.7 && < 5,

39+ base >= 4.5 && < 5,

40− base-compat >= 0.9.1 && < 0.12,

40+ base-compat >= 0.9.1 && < 0.11,

41 text >= 1.1.1.0,

42 time >= 1.1.1.4

benchmarks/AesonEncode.hs+1−1

@@ -7,7 +7,7 @@ module Main (main) where

7import Prelude.Compat

9import Control.DeepSeq

10−import Control.Monad (forM_)

10+import Control.Monad

11import Data.Aeson

12import Data.Attoparsec.ByteString (IResult(..), parseWith)

13import Data.Char (isDigit)

benchmarks/Compare/JsonBench.hs+1−2

@@ -20,7 +20,6 @@ import Data.Aeson ((.:))

20import Data.Monoid ((<>))

21import Data.Text (Text)

22import Typed.Common (load)

23−import qualified Control.Monad.Fail as Fail

24import qualified Data.Aeson as Aeson

23import qualified Data.Aeson as Aeson

25import qualified Data.BufferBuilder.Json as Json

24import qualified Data.BufferBuilder.Json as Json

@@ -83,7 +82,7 @@ genderTable = [("male", Male), ("female", Female)]

83fruitTable :: [(Text, Fruit)]

82fruitTable :: [(Text, Fruit)]

84fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]

83fruitTable = [("apple", Apple), ("strawberry", Strawberry), ("banana", Banana)]

86−enumFromJson :: Fail.MonadFail m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum

85+enumFromJson :: Monad m => String -> [(Text, enum)] -> (json -> m Text) -> json -> m enum

87enumFromJson enumName table extract v = do

86enumFromJson enumName table extract v = do

88 s <- extract v

87 s <- extract v

89 case lookup s table of

88 case lookup s table of

benchmarks/Issue673.hs−1

@@ -18,7 +18,6 @@ import Criterion.Main

18import Prelude.Compat

19import Data.Int (Int64)

20import Data.Scientific (Scientific)

21−import Data.Semigroup ((<>))

22import Data.Aeson.Parser (scientific)

21import Data.Aeson.Parser (scientific)

24import qualified Data.Attoparsec.ByteString.Lazy as AttoL

23import qualified Data.Attoparsec.ByteString.Lazy as AttoL

benchmarks/aeson-benchmarks.cabal+1−7

@@ -72,6 +72,7 @@ library

73 exposed-modules:

74 Data.Aeson

75+ Data.Aeson.Compat

75 Data.Aeson.Encoding

76 Data.Aeson.Encoding

76 Data.Aeson.Encoding.Builder

77 Data.Aeson.Encoding.Builder

77 Data.Aeson.Encoding.Internal

78 Data.Aeson.Encoding.Internal

@@ -175,9 +176,6 @@ executable aeson-benchmark-compare

175 Compare.JsonBuilder

176 Compare.JsonBuilder

176 build-depends:

177 build-depends:

177 json-builder

178 json-builder

178− if impl(ghc < 8.0)

179− build-depends:

180− semigroups

181

179

182executable aeson-benchmark-micro

180executable aeson-benchmark-micro

183 default-language: Haskell2010

181 default-language: Haskell2010

@@ -224,8 +222,6 @@ executable aeson-benchmark-typed

224 bytestring-builder >= 0.10.4 && < 1

222 bytestring-builder >= 0.10.4 && < 1

225 else

223 else

226 build-depends: bytestring >= 0.10.4

224 build-depends: bytestring >= 0.10.4

227− if impl(ghc < 8.0)

228− build-depends: semigroups

229

225

230executable aeson-benchmark-compare-with-json

226executable aeson-benchmark-compare-with-json

231 default-language: Haskell2010

227 default-language: Haskell2010

@@ -341,5 +337,3 @@ executable aeson-issue-673

341 scientific,

337 scientific,

342 base-compat,

338 base-compat,

343 criterion >= 1.0

339 criterion >= 1.0

344− if impl(ghc < 8.0)

345− build-depends: semigroups

cabal.project+1−3

@@ -1,5 +1,3 @@

1with-compiler: ghc

2packages: .

3−packages: attoparsec-iso8601

3+packages: attoparsec-iso8601, benchmarks

4−-- packages: benchmarks

5−tests: true

changelog.md−56

@@ -1,61 +1,5 @@

1For the latest version of this document, please see [https://github.com/bos/aeson/blob/master/changelog.md](https://github.com/bos/aeson/blob/master/changelog.md).

3−### upcoming

4−

5−* `FromJSON` instance of `Ratio a` now parses numbers in addtion to

6− standard `{numerator=..., denumerator=...}` encoding.

7−

8−### 1.4.6.0

9−

10−* Provide a clearer error message when a required tagKey for a constructor is missing, thanks to Guru Devanla.

11− The error message now looks like this: `Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found`

12−

13−* Add `formatPath` and `formatRelativePath` functions to turn a `JSONPath` into a `String`, thanks to Robbie McMichael

14−

15−

16−### 1.4.5.0

17−

18−* Expose `(<?>)`, `JSONPath` and `JSONPathElement(..)` from `Data.Aeson.Types`. Previously only available through internal modules. Thanks to Luke Clifton.

19−

20−* Support for base-compat 0.11, thanks to Ryan Scott.

21−

22−* Travis build for GHC 8.8, thanks to Oleg Grenrus.

23−

24−### 1.4.4.0

25−

26−**New features**:

27−

28−* Adds a parameterized parser `jsonWith` that can be used to choose how to handle duplicate keys in objects, thanks to Xia Li-Yao.

29−

30−* Add generic implementations of `FromJSONKey` and `ToJSONKey`, thanks to Xia Li-Yao. Example:

31−

32−```haskell

33−data Foo = Bar

34− deriving Generic

35−

36−opts :: JSONKeyOptions

37−opts = defaultJSONKeyOptions { keyModifier = toLower }

38−

39−instance ToJSONKey Foo where

40− toJSONKey = genericToJSONKey opts

41−

42−instance FromJSONKey Foo where

43− fromJSONKey = genericFromJSONKey opts

44−```

45−

46−**Minor**:

47−* aeson now uses `time-compat` instead of `time-locale-compat`, thanks to Oleg Grenrus.

48−* Prepare for `MonadFail` breakages in GHC 8.8, thanks to Oleg Grenrus.

49−* Require `bytestring >= 0.10.8.1` for newer GHCs to avoid build failures, thanks to Oleg Grenrus.

50−* Support `primitive 0.7.*`, thanks to Adam Bergmark.

51−* Allow `semigroups 0.19.*` and `hashable 1.3.*`, thanks to Oleg Grenrus.

52−* Fix a typo in the error message when parsing `NonEmpty`, thanks to Colin Woodbury.

53−* Document surprising behavior when using `omitNothingFields` with type variables, thanks to Xia Li-Yao.

54−

55−**Internal changes**:

56−* Code cleanup by Oleg Grenrus

57−* Fix dependencies of the benchmarks on older GHC's, thanks to Xia Li-Yao.

58−

59### 1.4.3.0

3### 1.4.3.0

60* Improve error messages for FromJSON in existing instances and GHC Generic implementation. Thanks to Xia Li-Yao & Igor Pashev.

4* Improve error messages for FromJSON in existing instances and GHC Generic implementation. Thanks to Xia Li-Yao & Igor Pashev.

61* Tweak error-reporting combinators and their documentation. Thanks to Xia Li-Yao.

5* Tweak error-reporting combinators and their documentation. Thanks to Xia Li-Yao.

run-hlint.shdeleted−7

@@ -1,7 +0,0 @@

1−#!/bin/bash

2−

3−if hash hlint 2>/dev/null; then

4− hlint "$@"

5−else

6− ./hlint.sh "$@"

7−fi

stack-bench.yaml+8−2

@@ -1,4 +1,4 @@

1−resolver: nightly-2019-09-21

1+resolver: lts-12.26

2# We use aeson in the snapshot to

3# - avoid recompilation of criterion

4# - compare against it

@@ -9,4 +9,10 @@ resolver: nightly-2019-09-21

9work-dir: .stack-work-bench

10packages:

11- benchmarks

12−extra-deps: []

12+extra-deps:

13+- base-orphans-0.8.1

14+- hashable-time-0.2.0.1

15+- QuickCheck-2.13.1

16+- quickcheck-instances-0.3.21

17+- splitmix-0.0.2

18+- time-compat-1.9.2.2

stack-ffi-unescape.yaml+7−2

@@ -1,4 +1,4 @@

1−resolver: nightly-2019-09-21

1+resolver: lts-12.26

2packages:

3- '.'

4flags:

@@ -6,4 +6,9 @@ flags:

6 fast: true

7 cffi: true

8extra-deps:

9−- Diff-0.4.0

9+- base-orphans-0.8.1

10+- hashable-time-0.2.0.1

11+- QuickCheck-2.13.1

12+- quickcheck-instances-0.3.21

13+- splitmix-0.0.2

14+- time-compat-1.9.2.2

stack-nightly.yaml+4−2

@@ -1,4 +1,4 @@

1−resolver: nightly-2019-10-14

1+resolver: nightly-2019-05-13

2packages:

3- '.'

4- attoparsec-iso8601

@@ -8,4 +8,6 @@ flags:

8 attoparsec-iso8601:

9 fast: true

10extra-deps:

11−- generic-deriving-1.12.4

11+- hlint-2.1.18

12+- time-compat-1.9.2.2

13+- quickcheck-instances-0.3.21

tests/Encoders.hs+6−38

@@ -6,7 +6,6 @@

6module Encoders (module Encoders) where

8import Prelude.Compat

9−import Data.Text (Text)

11import Data.Aeson.TH

10import Data.Aeson.TH

12import Data.Aeson.Types

11import Data.Aeson.Types

@@ -97,18 +96,6 @@ gNullaryToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingle

97gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary

96gNullaryParseJSONObjectWithSingleField :: Value -> Parser Nullary

98gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField

97gNullaryParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField

100−keyOptions :: JSONKeyOptions

101−keyOptions = defaultJSONKeyOptions { keyModifier = ('k' :) }

102−

103−gNullaryToJSONKey :: Nullary -> Either String Text

104−gNullaryToJSONKey x = case genericToJSONKey keyOptions of

105− ToJSONKeyText p _ -> Right (p x)

106− _ -> Left "Should be a ToJSONKeyText"

107−

108−gNullaryFromJSONKey :: Text -> Parser Nullary

109−gNullaryFromJSONKey t = case genericFromJSONKey keyOptions of

110− FromJSONKeyTextParser p -> p t

111− _ -> fail "Not a TextParser"

112

113--------------------------------------------------------------------------------

100--------------------------------------------------------------------------------

114-- SomeType encoders/decoders

101-- SomeType encoders/decoders

@@ -188,6 +175,7 @@ gSomeTypeToEncoding2ElemArray = genericToEncoding opts2ElemArray

188gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)

175gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)

189gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray

176gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray

190

177

178+#if __GLASGOW_HASKELL__ >= 706

191gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a

179gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a

192gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray

180gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray

193

181

@@ -196,6 +184,7 @@ gSomeTypeLiftToJSON2ElemArray = genericLiftToJSON opts2ElemArray

196

184

197gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a

185gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a

198gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray

186gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray

187+#endif

199

188

200

189

201gSomeTypeToJSONTaggedObject :: SomeType Int -> Value

190gSomeTypeToJSONTaggedObject :: SomeType Int -> Value

@@ -207,6 +196,7 @@ gSomeTypeToEncodingTaggedObject = genericToEncoding optsTaggedObject

207gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)

196gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)

208gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject

197gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject

209

198

199+#if __GLASGOW_HASKELL__ >= 706

210gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a

200gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a

211gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject

201gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject

212

202

@@ -215,6 +205,7 @@ gSomeTypeLiftToJSONTaggedObject = genericLiftToJSON optsTaggedObject

215

205

216gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a

206gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a

217gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject

207gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject

208+#endif

218

209

219

210

220gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value

211gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value

@@ -226,6 +217,7 @@ gSomeTypeToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingl

226gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)

217gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)

227gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField

218gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField

228

219

220+#if __GLASGOW_HASKELL__ >= 706

229gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a

221gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a

230gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField

222gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField

231

223

@@ -234,6 +226,7 @@ gSomeTypeLiftToJSONObjectWithSingleField = genericLiftToJSON optsObjectWithSingl

234

226

235gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a

227gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a

236gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField

228gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField

229+#endif

237

230

238

231

239gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value

232gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value

@@ -243,31 +236,6 @@ gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding

243gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields

236gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields

244

237

245

238

246−thSomeTypeParseJSONRejectUnknownFields :: Value -> Parser (SomeType Int)

247−thSomeTypeParseJSONRejectUnknownFields = $(mkParseJSON optsRejectUnknownFields ''SomeType)

248−

249−gSomeTypeParseJSONRejectUnknownFields :: Value -> Parser (SomeType Int)

250−gSomeTypeParseJSONRejectUnknownFields = genericParseJSON optsRejectUnknownFields

251−

252−

253−--------------------------------------------------------------------------------

254−-- Foo decoders

255−--------------------------------------------------------------------------------

256−

257−thFooParseJSONRejectUnknownFields :: Value -> Parser Foo

258−thFooParseJSONRejectUnknownFields = $(mkParseJSON optsRejectUnknownFields ''Foo)

259−

260−gFooParseJSONRejectUnknownFields :: Value -> Parser Foo

261−gFooParseJSONRejectUnknownFields = genericParseJSON optsRejectUnknownFields

262−

263−

264−thFooParseJSONRejectUnknownFieldsTagged :: Value -> Parser Foo

265−thFooParseJSONRejectUnknownFieldsTagged = $(mkParseJSON optsRejectUnknownFieldsTagged ''Foo)

266−

267−gFooParseJSONRejectUnknownFieldsTagged :: Value -> Parser Foo

268−gFooParseJSONRejectUnknownFieldsTagged = genericParseJSON optsRejectUnknownFieldsTagged

269−

270−

271--------------------------------------------------------------------------------

239--------------------------------------------------------------------------------

272-- Option fields

240-- Option fields

273--------------------------------------------------------------------------------

241--------------------------------------------------------------------------------

tests/ErrorMessages.hs+1−27

@@ -13,7 +13,7 @@ import Data.Aeson (FromJSON(..), Value, json)

13import Data.Aeson.Types (Parser)

14import Data.Aeson.Parser (eitherDecodeWith)

15import Data.Aeson.Internal (formatError, iparse)

16−import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)

16+import Data.Algorithm.Diff (Diff(..), getGroupedDiff)

17import Data.Proxy (Proxy(..))

18import Data.Semigroup ((<>))

19import Data.Sequence (Seq)

@@ -136,29 +136,6 @@ outputGeneric choice = concat

136 , "[1,"

137 ]

138

139− , testWithSomeType "SomeType (reject unknown fields)"

140− (select

141− thSomeTypeParseJSONRejectUnknownFields

142− gSomeTypeParseJSONRejectUnknownFields)

143− [ "{\"tag\": \"record\", \"testOne\": 1.0, \"testZero\": 1}"

144− , "{\"testZero\": 1}"

145− , "{\"tag\": \"record\", \"testone\": true, \"testtwo\": null, \"testthree\": null}"

146− ]

147−

148− , testWithFoo "Foo (reject unknown fields)"

149− (select

150− thFooParseJSONRejectUnknownFields

151− gFooParseJSONRejectUnknownFields)

152− [ "{\"tag\": \"foo\"}"

153− ]

154−

155− , testWithFoo "Foo (reject unknown fields, tagged single)"

156− (select

157− thFooParseJSONRejectUnknownFieldsTagged

158− gFooParseJSONRejectUnknownFieldsTagged)

159− [ "{\"tag\": \"foo\", \"unknownField\": 0}"

160− ]

161−

162 , testWith "EitherTextInt"

139 , testWith "EitherTextInt"

163 (select

140 (select

164 thEitherTextIntParseJSONUntaggedValue

141 thEitherTextIntParseJSONUntaggedValue

@@ -219,6 +196,3 @@ testFor name _ = testWith name (parseJSON :: Value -> Parser a)

219

196

220testWithSomeType :: String -> (Value -> Parser (SomeType Int)) -> [L.ByteString] -> Output

197testWithSomeType :: String -> (Value -> Parser (SomeType Int)) -> [L.ByteString] -> Output

221testWithSomeType = testWith

198testWithSomeType = testWith

222−

223−testWithFoo :: String -> (Value -> Parser Foo) -> [L.ByteString] -> Output

224−testWithFoo = testWith

tests/Instances.hs+4−1

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE FlexibleContexts #-}

2{-# LANGUAGE FlexibleContexts #-}

2{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE FlexibleInstances #-}

3{-# LANGUAGE NoImplicitPrelude #-}

4{-# LANGUAGE NoImplicitPrelude #-}

@@ -24,12 +25,14 @@ import qualified Data.HashMap.Strict as HM

25import Data.Orphans ()

26import Data.Orphans ()

26import Test.QuickCheck.Instances ()

27import Test.QuickCheck.Instances ()

28+#if MIN_VERSION_base(4,7,0)

27import Data.Hashable.Time ()

29import Data.Hashable.Time ()

30+#endif

29-- "System" types.

32-- "System" types.

31instance Arbitrary DotNetTime where

34instance Arbitrary DotNetTime where

32− arbitrary = DotNetTime `fmap` arbitrary

35+ arbitrary = DotNetTime `liftM` arbitrary

33 shrink = map DotNetTime . shrink . fromDotNetTime

36 shrink = map DotNetTime . shrink . fromDotNetTime

35-- | Compare timezone part only on 'timeZoneMinutes'

38-- | Compare timezone part only on 'timeZoneMinutes'

tests/Options.hs−11

@@ -55,14 +55,3 @@ optsOptionField = optsDefault

55 { fieldLabelModifier = const "field"

56 , omitNothingFields = True

57 }

58−

59−optsRejectUnknownFields :: Options

60−optsRejectUnknownFields = optsDefault

61− { rejectUnknownFields = True

62− }

63−

64−optsRejectUnknownFieldsTagged :: Options

65−optsRejectUnknownFieldsTagged = optsDefault

66− { rejectUnknownFields = True

67− , tagSingleConstructors = True

68− }

tests/PropertyGeneric.hs+8

@@ -44,9 +44,11 @@ genericTests =

44 , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)

45 , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)

47+#if __GLASGOW_HASKELL__ >= 706

47 , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)

48 , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)

48 , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)

49 , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)

49 , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)

50 , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)

51+#endif

50 ]

52 ]

51 ]

53 ]

52 , testGroup "OneConstructor" [

54 , testGroup "OneConstructor" [

@@ -83,24 +85,30 @@ genericTests =

84 , testProperty "SomeType2ElemArray" $

86 , testProperty "SomeType2ElemArray" $

85 gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray

87 gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray

88+#if __GLASGOW_HASKELL__ >= 706

86 , testProperty "SomeType2ElemArray unary" $

89 , testProperty "SomeType2ElemArray unary" $

87 gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray

90 gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray

88 , testProperty "SomeType2ElemArray unary agree" $

91 , testProperty "SomeType2ElemArray unary agree" $

89 gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray

92 gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray

93+#endif

91 , testProperty "SomeTypeTaggedObject" $

95 , testProperty "SomeTypeTaggedObject" $

92 gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject

96 gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject

97+#if __GLASGOW_HASKELL__ >= 706

93 , testProperty "SomeTypeTaggedObject unary" $

98 , testProperty "SomeTypeTaggedObject unary" $

94 gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject

99 gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject

95 , testProperty "SomeTypeTaggedObject unary agree" $

100 , testProperty "SomeTypeTaggedObject unary agree" $

96 gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject

101 gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject

102+#endif

103

98 , testProperty "SomeTypeObjectWithSingleField" $

104 , testProperty "SomeTypeObjectWithSingleField" $

99 gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField

105 gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField

106+#if __GLASGOW_HASKELL__ >= 706

100 , testProperty "SomeTypeObjectWithSingleField unary" $

107 , testProperty "SomeTypeObjectWithSingleField unary" $

101 gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField

108 gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField

102 , testProperty "SomeTypeObjectWithSingleField unary agree" $

109 , testProperty "SomeTypeObjectWithSingleField unary agree" $

103 gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField

110 gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField

111+#endif

104

112

105 , testProperty "SomeTypeOmitNothingFields" $

113 , testProperty "SomeTypeOmitNothingFields" $

106 gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields

114 gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields

tests/PropertyKeys.hs+3

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

1{-# LANGUAGE NoImplicitPrelude #-}

2{-# LANGUAGE NoImplicitPrelude #-}

3module PropertyKeys ( keysTests ) where

4module PropertyKeys ( keysTests ) where

@@ -30,10 +31,12 @@ keysTests =

30 , testProperty "Natural" $ roundTripKey (undefined :: Natural)

31 , testProperty "Natural" $ roundTripKey (undefined :: Natural)

31 , testProperty "Float" $ roundTripKey (undefined :: Float)

32 , testProperty "Float" $ roundTripKey (undefined :: Float)

32 , testProperty "Double" $ roundTripKey (undefined :: Double)

33 , testProperty "Double" $ roundTripKey (undefined :: Double)

34+#if MIN_VERSION_base(4,7,0)

33 , testProperty "Day" $ roundTripKey (undefined :: Day)

35 , testProperty "Day" $ roundTripKey (undefined :: Day)

34 , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)

36 , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)

35 , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)

37 , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)

36 , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)

38 , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)

39+#endif

37 , testProperty "Version" $ roundTripKey (undefined :: Version)

40 , testProperty "Version" $ roundTripKey (undefined :: Version)

38 , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)

41 , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)

39 , testProperty "UUID" $ roundTripKey UUID.nil

42 , testProperty "UUID" $ roundTripKey UUID.nil

tests/SerializationFormatSpec.hs+4

@@ -3,7 +3,9 @@

3{-# LANGUAGE GADTs #-}

4{-# LANGUAGE NoImplicitPrelude #-}

5{-# LANGUAGE OverloadedStrings #-}

6+#if __GLASGOW_HASKELL__ >= 708

6{-# LANGUAGE DataKinds #-}

7{-# LANGUAGE DataKinds #-}

8+#endif

8------------------------------------------------------------------------------

10------------------------------------------------------------------------------

9-- These tests assert that the JSON serialization doesn't change by accident.

11-- These tests assert that the JSON serialization doesn't change by accident.

@@ -75,8 +77,10 @@ jsonExamples =

75 , example "Just" "1" (Just 1 :: Maybe Int)

77 , example "Just" "1" (Just 1 :: Maybe Int)

76 , example "Proxy Int" "null" (Proxy :: Proxy Int)

78 , example "Proxy Int" "null" (Proxy :: Proxy Int)

77 , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)

79 , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)

80+#if __GLASGOW_HASKELL__ >= 708

78 -- Test Tagged instance is polykinded

81 -- Test Tagged instance is polykinded

79 , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)

82 , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)

83+#endif

80 , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)

84 , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)

81 , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))

85 , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))

82 , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)

86 , example "NonEmpty" "[1,2,3]" (1 :| [2, 3] :: NonEmpty Int)

tests/Types.hs+2

@@ -119,7 +119,9 @@ deriving instance Generic (Sum4 a b c d)

119deriving instance Generic (Approx a)

120deriving instance Generic Nullary

121deriving instance Generic (SomeType a)

122+#if __GLASGOW_HASKELL__ >= 706

122deriving instance Generic1 SomeType

123deriving instance Generic1 SomeType

124+#endif

123deriving instance Generic OptionField

125deriving instance Generic OptionField

124deriving instance Generic EitherTextInt

126deriving instance Generic EitherTextInt

125

127

tests/UnitTests.hs+3−162

@@ -29,19 +29,12 @@ import Data.Aeson.Internal (JSONPathElement(..), formatError)

29import Data.Aeson.QQ.Simple (aesonQQ)

30import Data.Aeson.TH (deriveJSON, deriveToJSON, deriveToJSON1)

31import Data.Aeson.Text (encodeToTextBuilder)

32−import Data.Aeson.Parser

33− ( json, jsonLast, jsonAccum, jsonNoDup

34− , json', jsonLast', jsonAccum', jsonNoDup')

35−import Data.Aeson.Types

36− ( Options(..), Result(Success, Error), ToJSON(..)

37− , Value(Array, Bool, Null, Number, Object, String), camelTo, camelTo2

38− , defaultOptions, formatPath, formatRelativePath, omitNothingFields, parse)

32+import Data.Aeson.Types (Options(..), Result(Success), ToJSON(..), Value(Null, Object), camelTo, camelTo2, defaultOptions, omitNothingFields, parse)

39−import Data.Attoparsec.ByteString (Parser, parseOnly)

40import Data.Char (toUpper)

33import Data.Char (toUpper)

41import Data.Either.Compat (isLeft, isRight)

34import Data.Either.Compat (isLeft, isRight)

42import Data.Hashable (hash)

35import Data.Hashable (hash)

43import Data.HashMap.Strict (HashMap)

36import Data.HashMap.Strict (HashMap)

44−import Data.List (sort, isSuffixOf)

37+import Data.List (sort)

45import Data.Maybe (fromMaybe)

38import Data.Maybe (fromMaybe)

46import Data.Scientific (Scientific, scientific)

39import Data.Scientific (Scientific, scientific)

47import Data.Tagged (Tagged(..))

40import Data.Tagged (Tagged(..))

@@ -54,19 +47,16 @@ import Numeric.Natural (Natural)

54import System.Directory (getDirectoryContents)

47import System.Directory (getDirectoryContents)

55import System.FilePath ((</>), takeExtension, takeFileName)

48import System.FilePath ((</>), takeExtension, takeFileName)

56import Test.Tasty (TestTree, testGroup)

49import Test.Tasty (TestTree, testGroup)

57−import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase, (@?=))

50+import Test.Tasty.HUnit (Assertion, assertBool, assertFailure, assertEqual, testCase)

58import Text.Printf (printf)

51import Text.Printf (printf)

59import UnitTests.NullaryConstructors (nullaryConstructors)

52import UnitTests.NullaryConstructors (nullaryConstructors)

60−import qualified Data.ByteString as S

61import qualified Data.ByteString.Base16.Lazy as LBase16

53import qualified Data.ByteString.Base16.Lazy as LBase16

62import qualified Data.ByteString.Lazy.Char8 as L

54import qualified Data.ByteString.Lazy.Char8 as L

63import qualified Data.HashSet as HashSet

55import qualified Data.HashSet as HashSet

64−import qualified Data.HashMap.Lazy as HashMap

65import qualified Data.Text.Lazy as LT

56import qualified Data.Text.Lazy as LT

66import qualified Data.Text.Lazy.Builder as TLB

57import qualified Data.Text.Lazy.Builder as TLB

67import qualified Data.Text.Lazy.Encoding as LT

58import qualified Data.Text.Lazy.Encoding as LT

68import qualified Data.Text.Lazy.Encoding as TLE

59import qualified Data.Text.Lazy.Encoding as TLE

69−import qualified Data.Vector as Vector

70import qualified ErrorMessages

60import qualified ErrorMessages

71import qualified SerializationFormatSpec

61import qualified SerializationFormatSpec

@@ -112,12 +102,7 @@ tests = testGroup "unit" [

112 , testGroup "SingleMaybeField" singleMaybeField

102 , testGroup "SingleMaybeField" singleMaybeField

113 , testCase "withEmbeddedJSON" withEmbeddedJSONTest

103 , testCase "withEmbeddedJSON" withEmbeddedJSONTest

114 , testCase "SingleFieldCon" singleFieldCon

104 , testCase "SingleFieldCon" singleFieldCon

115− , testGroup "UnknownFields" unknownFields

116− , testGroup "Ordering of object keys" keyOrdering

117 , testCase "Ratio with denominator 0" ratioDenominator0

105 , testCase "Ratio with denominator 0" ratioDenominator0

118− , testCase "Rational parses number" rationalNumber

119− , testCase "Big rational" bigRationalDecoding

120− , testCase "Small rational" smallRationalDecoding

121 , testCase "Big scientific exponent" bigScientificExponent

106 , testCase "Big scientific exponent" bigScientificExponent

122 , testCase "Big integer decoding" bigIntegerDecoding

107 , testCase "Big integer decoding" bigIntegerDecoding

123 , testCase "Big natural decading" bigNaturalDecoding

108 , testCase "Big natural decading" bigNaturalDecoding

@@ -258,18 +243,6 @@ formatErrorExample =

258 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"

243 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"

259 in assertEqual "formatError example" lhs rhs

244 in assertEqual "formatError example" lhs rhs

260

245

261−formatPathExample :: Assertion

262−formatPathExample =

263− let rhs = formatPath [Key "x", Index 0]

264− lhs = "$.x[0]"

265− in assertEqual "formatPath example" lhs rhs

266−

267−formatRelativePathExample :: Assertion

268−formatRelativePathExample =

269− let rhs = formatPath [Key "x", Index 0]

270− lhs = ".x[0]"

271− in assertEqual "formatRelativePath example" lhs rhs

272−

273------------------------------------------------------------------------------

246------------------------------------------------------------------------------

274-- Comparison (.:?) and (.:!)

247-- Comparison (.:?) and (.:!)

275------------------------------------------------------------------------------

248------------------------------------------------------------------------------

@@ -540,7 +513,6 @@ showOptions =

540 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"

513 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"

541 ++ ", unwrapUnaryRecords = False"

514 ++ ", unwrapUnaryRecords = False"

542 ++ ", tagSingleConstructors = False"

515 ++ ", tagSingleConstructors = False"

543− ++ ", rejectUnknownFields = False"

544 ++ "}")

516 ++ "}")

545 (show defaultOptions)

517 (show defaultOptions)

546

518

@@ -585,138 +557,12 @@ singleFieldCon :: Assertion

585singleFieldCon =

557singleFieldCon =

586 assertEqual "fromJSON" (Right (SingleFieldCon 0)) (eitherDecode "0")

558 assertEqual "fromJSON" (Right (SingleFieldCon 0)) (eitherDecode "0")

587

559

588−newtype UnknownFields = UnknownFields { knownField :: Int }

589− deriving (Eq, Show, Generic)

590−newtype UnknownFieldsTag = UnknownFieldsTag { tag :: Int }

591− deriving (Eq, Show, Generic)

592−newtype UnknownFieldsUnaryTagged = UnknownFieldsUnaryTagged { knownFieldUnaryTagged :: Int }

593− deriving (Eq, Show, Generic)

594−data UnknownFieldsSum

595− = UnknownFields1 { knownField1 :: Int }

596− | UnknownFields2 { knownField2 :: Int }

597− deriving (Eq, Show, Generic)

598−

599−unknownFields :: [TestTree]

600−unknownFields = concat

601− [ testsUnary

602− "unary-unknown"

603− (object [("knownField", Number 1), ("unknownField", Number 1)])

604− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFields)

605− , testsUnary

606− "unary-unknown-tag"

607− (object [("knownField", Number 1), ("tag", String "UnknownFields")])

608− (Error "nknown fields: [\"tag\"]" :: Result UnknownFields)

609− , testsUnaryTag

610− "unary-explicit-tag"

611− (object [("tag", Number 1)])

612− (Success $ UnknownFieldsTag 1)

613− , testsSum

614− "sum-tag"

615− (object [("knownField1", Number 1), ("tag", String "UnknownFields1")])

616− (Success $ UnknownFields1 1)

617− , testsSum

618− "sum-unknown-in-branch"

619− (object [("knownField1", Number 1), ("knownField2", Number 1), ("tag", String "UnknownFields1")])

620− (Error "nknown fields: [\"knownField2\"]" :: Result UnknownFieldsSum)

621− , testsSum

622− "sum-unknown"

623− (object [("knownField1", Number 1), ("unknownField", Number 1), ("tag", String "UnknownFields1")])

624− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsSum)

625− , testsTagged

626− "unary-tagged"

627− (object [("knownFieldUnaryTagged", Number 1), ("tag", String "UnknownFieldsUnaryTagged")])

628− (Success $ UnknownFieldsUnaryTagged 1)

629− , -- Just a case to verify that the tag isn't optional, this is likely already tested by other unit tests

630− testsTagged

631− "unary-tagged-notag"

632− (object [("knownFieldUnaryTagged", Number 1)])

633− (Error "key \"tag\" not found" :: Result UnknownFieldsUnaryTagged)

634− , testsTagged

635− "unary-tagged-unknown"

636− (object [ ("knownFieldUnaryTagged", Number 1), ("unknownField", Number 1)

637− , ("tag", String "UnknownFieldsUnaryTagged")])

638− (Error "nknown fields: [\"unknownField\"]" :: Result UnknownFieldsUnaryTagged)

639− ]

640− where

641− opts = defaultOptions{rejectUnknownFields=True}

642− taggedOpts = opts{tagSingleConstructors=True}

643− assertApprox :: (Show a, Eq a) => Result a -> Result a -> IO ()

644− assertApprox (Error expected) (Error actual) | expected `isSuffixOf` actual = return ()

645− assertApprox expected actual = assertEqual "fromJSON" expected actual

646− testsBase :: (Show a, Eq a) => (Value -> Result a) -> (Value -> Result a)

647− -> String -> Value -> Result a -> [TestTree]

648− testsBase th g name value expected =

649− [ testCase (name ++ "-th") $ assertApprox expected (th value)

650− , testCase (name ++ "-generic") $ assertApprox expected (g value)

651− ]

652− testsUnary :: String -> Value -> Result UnknownFields -> [TestTree]

653− testsUnary = testsBase fromJSON (parse (genericParseJSON opts))

654− testsUnaryTag :: String -> Value -> Result UnknownFieldsTag -> [TestTree]

655− testsUnaryTag = testsBase fromJSON (parse (genericParseJSON opts))

656− testsSum :: String -> Value -> Result UnknownFieldsSum -> [TestTree]

657− testsSum = testsBase fromJSON (parse (genericParseJSON opts))

658− testsTagged :: String -> Value -> Result UnknownFieldsUnaryTagged -> [TestTree]

659− testsTagged = testsBase fromJSON (parse (genericParseJSON taggedOpts))

660−

661−testParser :: (Eq a, Show a)

662− => String -> Parser a -> S.ByteString -> Either String a -> TestTree

663−testParser name json_ s expected =

664− testCase name (parseOnly json_ s @?= expected)

665−

666−keyOrdering :: [TestTree]

667−keyOrdering =

668− [ testParser "json" json

669− "{\"k\":true,\"k\":false}" $

670− Right (Object (HashMap.fromList [("k", Bool True)]))

671− , testParser "jsonLast" jsonLast

672− "{\"k\":true,\"k\":false}" $

673− Right (Object (HashMap.fromList [("k", Bool False)]))

674− , testParser "jsonAccum" jsonAccum

675− "{\"k\":true,\"k\":false}" $

676− Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))

677− , testParser "jsonNoDup" jsonNoDup

678− "{\"k\":true,\"k\":false}" $

679− Left "Failed reading: found duplicate key: \"k\""

680−

681− , testParser "json'" json'

682− "{\"k\":true,\"k\":false}" $

683− Right (Object (HashMap.fromList [("k", Bool True)]))

684− , testParser "jsonLast'" jsonLast'

685− "{\"k\":true,\"k\":false}" $

686− Right (Object (HashMap.fromList [("k", Bool False)]))

687− , testParser "jsonAccum'" jsonAccum'

688− "{\"k\":true,\"k\":false}" $

689− Right (Object (HashMap.fromList [("k", Array (Vector.fromList [Bool True, Bool False]))]))

690− , testParser "jsonNoDup'" jsonNoDup'

691− "{\"k\":true,\"k\":false}" $

692− Left "Failed reading: found duplicate key: \"k\""

693− ]

694−

695ratioDenominator0 :: Assertion

560ratioDenominator0 :: Assertion

696ratioDenominator0 =

561ratioDenominator0 =

697 assertEqual "Ratio with denominator 0"

562 assertEqual "Ratio with denominator 0"

698 (Left "Error in $: Ratio denominator was 0")

563 (Left "Error in $: Ratio denominator was 0")

699 (eitherDecode "{ \"numerator\": 1, \"denominator\": 0 }" :: Either String Rational)

564 (eitherDecode "{ \"numerator\": 1, \"denominator\": 0 }" :: Either String Rational)

700

565

701−rationalNumber :: Assertion

702−rationalNumber =

703− assertEqual "Ratio with denominator 0"

704− (Right 1.37)

705− (eitherDecode "1.37" :: Either String Rational)

706−

707−bigRationalDecoding :: Assertion

708−bigRationalDecoding =

709− assertEqual "Decoding an Integer with a large exponent should fail"

710− (Left "Error in $: parsing Ratio failed, found a number with exponent 2000, but it must not be greater than 1024 or less than -1024")

711− ((eitherDecode :: L.ByteString -> Either String Rational) "1e2000")

712−

713−smallRationalDecoding :: Assertion

714−smallRationalDecoding =

715− assertEqual "Decoding an Integer with a large exponent should fail"

716− (Left "Error in $: parsing Ratio failed, found a number with exponent -2000, but it must not be greater than 1024 or less than -1024")

717− ((eitherDecode :: L.ByteString -> Either String Rational) "1e-2000")

718−

719−

720bigScientificExponent :: Assertion

566bigScientificExponent :: Assertion

721bigScientificExponent =

567bigScientificExponent =

722 assertEqual "Encoding an integral scientific with a large exponent should normalize it"

568 assertEqual "Encoding an integral scientific with a large exponent should normalize it"

@@ -753,8 +599,3 @@ deriveToJSON defaultOptions ''Foo

753deriveToJSON1 defaultOptions ''Foo

599deriveToJSON1 defaultOptions ''Foo

754

600

755deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField

601deriveJSON defaultOptions{omitNothingFields=True,unwrapUnaryRecords=True} ''SingleMaybeField

756−

757−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFields

758−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsTag

759−deriveJSON defaultOptions{tagSingleConstructors=True,rejectUnknownFields=True} ''UnknownFieldsUnaryTagged

760−deriveJSON defaultOptions{rejectUnknownFields=True} ''UnknownFieldsSum

tests/UnitTests/NullaryConstructors.hs−5

@@ -14,7 +14,6 @@ import Data.Aeson (decode, eitherDecode, fromEncoding, Value)

14import Data.Aeson.Internal (IResult (..), iparse)

15import Data.Aeson.Types (Parser)

16import Data.ByteString.Builder (toLazyByteString)

17−import Data.Foldable (for_)

18import Data.Maybe (fromJust)

17import Data.Maybe (fromJust)

19import Encoders

18import Encoders

20import Test.Tasty.HUnit ((@=?), Assertion)

19import Test.Tasty.HUnit ((@=?), Assertion)

@@ -53,10 +52,6 @@ nullaryConstructors =

53 -- Make sure that the old `"contents" : []' is still allowed

52 -- Make sure that the old `"contents" : []' is still allowed

54 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")

53 , ISuccess C1 @=? parse thNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")

55 , ISuccess C1 @=? parse gNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")

54 , ISuccess C1 @=? parse gNullaryParseJSONTaggedObject (dec "{\"tag\":\"c1\",\"contents\":[]}")

56−

57− , for_ [("kC1", C1), ("kC2", C2), ("kC3", C3)] $ \(jkey, key) -> do

58− Right jkey @=? gNullaryToJSONKey key

59− ISuccess key @=? parse gNullaryFromJSONKey jkey

60 ]

55 ]

61 where

56 where

62 enc = eitherDecode . toLazyByteString . fromEncoding

57 enc = eitherDecode . toLazyByteString . fromEncoding

tests/golden/generic.expected+3−11

@@ -6,11 +6,11 @@ Error in $: parsing Types.Nullary failed, expected one of the tags ["C1","C2","C

6Error in $: parsing Types.Nullary failed, expected String, but encountered Array

7SomeType (tagged)

8Error in $.contents: parsing Int failed, expected Number, but encountered Boolean

9−Error in $: parsing Types.SomeType(Unary) failed, key "contents" not found

9+Error in $: parsing Types.SomeType(Unary) failed, key "contents" not present

10−Error in $: parsing Types.SomeType(Record) failed, key "testone" not found

10+Error in $: parsing Types.SomeType(Record) failed, key "testone" not present

11Error in $.testone: parsing Double failed, unexpected Boolean

12Error in $.tag: parsing Types.SomeType failed, expected tag field to be one of ["nullary","unary","product","record","list"], but found tag "X"

13−Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found

13+Error in $: parsing Types.SomeType failed, key "tag" not present

14Error in $: parsing Types.SomeType failed, expected Object, but encountered Array

15SomeType (single-field)

16Error in $.unary: parsing Int failed, expected Number, but encountered Object

@@ -31,14 +31,6 @@ Error in $: parsing Types.SomeType failed, expected a 2-element Array, but encou

31Error in $: parsing Types.SomeType failed, expected Array, but encountered Object

32Error in $: not enough input. Expecting ',' or ']'

33Error in $: not enough input. Expecting json list value

34−SomeType (reject unknown fields)

35−Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testZero"]

36−Error in $: parsing Types.SomeType failed, expected Object with key "tag" containing one of ["nullary","unary","product","record","list"], key "tag" not found

37−Error in $: parsing Types.SomeType(Record) failed, unknown fields: ["testtwo","testone","testthree"]

38−Foo (reject unknown fields)

39−Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["tag"]

40−Foo (reject unknown fields, tagged single)

41−Error in $: parsing Types.Foo(Foo) failed, unknown fields: ["unknownField"]

42EitherTextInt

34EitherTextInt

43Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected tag "nonenullary", but found tag "X"

35Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected tag "nonenullary", but found tag "X"

44Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected String, but encountered Array

36Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected String, but encountered Array

travis/cabal_macros.hdeleted−448

@@ -1,448 +0,0 @@

1−/* DO NOT EDIT: This file is automatically generated by Cabal */

2−

3−/* package aeson-1.4.4.0 */

4−#ifndef VERSION_aeson

5−#define VERSION_aeson "1.4.4.0"

6−#endif /* VERSION_aeson */

7−#ifndef MIN_VERSION_aeson

8−#define MIN_VERSION_aeson(major1,major2,minor) (\

9− (major1) < 1 || \

10− (major1) == 1 && (major2) < 4 || \

11− (major1) == 1 && (major2) == 4 && (minor) <= 4)

12−#endif /* MIN_VERSION_aeson */

13−

14−/* package Diff-0.3.4 */

15−#ifndef VERSION_Diff

16−#define VERSION_Diff "0.3.4"

17−#endif /* VERSION_Diff */

18−#ifndef MIN_VERSION_Diff

19−#define MIN_VERSION_Diff(major1,major2,minor) (\

20− (major1) < 0 || \

21− (major1) == 0 && (major2) < 3 || \

22− (major1) == 0 && (major2) == 3 && (minor) <= 4)

23−#endif /* MIN_VERSION_Diff */

24−

25−/* package QuickCheck-2.13.1 */

26−#ifndef VERSION_QuickCheck

27−#define VERSION_QuickCheck "2.13.1"

28−#endif /* VERSION_QuickCheck */

29−#ifndef MIN_VERSION_QuickCheck

30−#define MIN_VERSION_QuickCheck(major1,major2,minor) (\

31− (major1) < 2 || \

32− (major1) == 2 && (major2) < 13 || \

33− (major1) == 2 && (major2) == 13 && (minor) <= 1)

34−#endif /* MIN_VERSION_QuickCheck */

35−

36−/* package aeson-1.4.4.0 */

37−#ifndef VERSION_aeson

38−#define VERSION_aeson "1.4.4.0"

39−#endif /* VERSION_aeson */

40−#ifndef MIN_VERSION_aeson

41−#define MIN_VERSION_aeson(major1,major2,minor) (\

42− (major1) < 1 || \

43− (major1) == 1 && (major2) < 4 || \

44− (major1) == 1 && (major2) == 4 && (minor) <= 4)

45−#endif /* MIN_VERSION_aeson */

46−

47−/* package attoparsec-0.13.2.2 */

48−#ifndef VERSION_attoparsec

49−#define VERSION_attoparsec "0.13.2.2"

50−#endif /* VERSION_attoparsec */

51−#ifndef MIN_VERSION_attoparsec

52−#define MIN_VERSION_attoparsec(major1,major2,minor) (\

53− (major1) < 0 || \

54− (major1) == 0 && (major2) < 13 || \

55− (major1) == 0 && (major2) == 13 && (minor) <= 2)

56−#endif /* MIN_VERSION_attoparsec */

57−

58−/* package base-4.12.0.0 */

59−#ifndef VERSION_base

60−#define VERSION_base "4.12.0.0"

61−#endif /* VERSION_base */

62−#ifndef MIN_VERSION_base

63−#define MIN_VERSION_base(major1,major2,minor) (\

64− (major1) < 4 || \

65− (major1) == 4 && (major2) < 12 || \

66− (major1) == 4 && (major2) == 12 && (minor) <= 0)

67−#endif /* MIN_VERSION_base */

68−

69−/* package base-compat-0.10.5 */

70−#ifndef VERSION_base_compat

71−#define VERSION_base_compat "0.10.5"

72−#endif /* VERSION_base_compat */

73−#ifndef MIN_VERSION_base_compat

74−#define MIN_VERSION_base_compat(major1,major2,minor) (\

75− (major1) < 0 || \

76− (major1) == 0 && (major2) < 10 || \

77− (major1) == 0 && (major2) == 10 && (minor) <= 5)

78−#endif /* MIN_VERSION_base_compat */

79−

80−/* package base-orphans-0.8.1 */

81−#ifndef VERSION_base_orphans

82−#define VERSION_base_orphans "0.8.1"

83−#endif /* VERSION_base_orphans */

84−#ifndef MIN_VERSION_base_orphans

85−#define MIN_VERSION_base_orphans(major1,major2,minor) (\

86− (major1) < 0 || \

87− (major1) == 0 && (major2) < 8 || \

88− (major1) == 0 && (major2) == 8 && (minor) <= 1)

89−#endif /* MIN_VERSION_base_orphans */

90−

91−/* package base16-bytestring-0.1.1.6 */

92−#ifndef VERSION_base16_bytestring

93−#define VERSION_base16_bytestring "0.1.1.6"

94−#endif /* VERSION_base16_bytestring */

95−#ifndef MIN_VERSION_base16_bytestring

96−#define MIN_VERSION_base16_bytestring(major1,major2,minor) (\

97− (major1) < 0 || \

98− (major1) == 0 && (major2) < 1 || \

99− (major1) == 0 && (major2) == 1 && (minor) <= 1)

100−#endif /* MIN_VERSION_base16_bytestring */

101−

102−/* package bytestring-0.10.8.2 */

103−#ifndef VERSION_bytestring

104−#define VERSION_bytestring "0.10.8.2"

105−#endif /* VERSION_bytestring */

106−#ifndef MIN_VERSION_bytestring

107−#define MIN_VERSION_bytestring(major1,major2,minor) (\

108− (major1) < 0 || \

109− (major1) == 0 && (major2) < 10 || \

110− (major1) == 0 && (major2) == 10 && (minor) <= 8)

111−#endif /* MIN_VERSION_bytestring */

112−

113−/* package containers-0.6.0.1 */

114−#ifndef VERSION_containers

115−#define VERSION_containers "0.6.0.1"

116−#endif /* VERSION_containers */

117−#ifndef MIN_VERSION_containers

118−#define MIN_VERSION_containers(major1,major2,minor) (\

119− (major1) < 0 || \

120− (major1) == 0 && (major2) < 6 || \

121− (major1) == 0 && (major2) == 6 && (minor) <= 0)

122−#endif /* MIN_VERSION_containers */

123−

124−/* package directory-1.3.3.0 */

125−#ifndef VERSION_directory

126−#define VERSION_directory "1.3.3.0"

127−#endif /* VERSION_directory */

128−#ifndef MIN_VERSION_directory

129−#define MIN_VERSION_directory(major1,major2,minor) (\

130− (major1) < 1 || \

131− (major1) == 1 && (major2) < 3 || \

132− (major1) == 1 && (major2) == 3 && (minor) <= 3)

133−#endif /* MIN_VERSION_directory */

134−

135−/* package dlist-0.8.0.6 */

136−#ifndef VERSION_dlist

137−#define VERSION_dlist "0.8.0.6"

138−#endif /* VERSION_dlist */

139−#ifndef MIN_VERSION_dlist

140−#define MIN_VERSION_dlist(major1,major2,minor) (\

141− (major1) < 0 || \

142− (major1) == 0 && (major2) < 8 || \

143− (major1) == 0 && (major2) == 8 && (minor) <= 0)

144−#endif /* MIN_VERSION_dlist */

145−

146−/* package filepath-1.4.2.1 */

147−#ifndef VERSION_filepath

148−#define VERSION_filepath "1.4.2.1"

149−#endif /* VERSION_filepath */

150−#ifndef MIN_VERSION_filepath

151−#define MIN_VERSION_filepath(major1,major2,minor) (\

152− (major1) < 1 || \

153− (major1) == 1 && (major2) < 4 || \

154− (major1) == 1 && (major2) == 4 && (minor) <= 2)

155−#endif /* MIN_VERSION_filepath */

156−

157−/* package generic-deriving-1.12.4 */

158−#ifndef VERSION_generic_deriving

159−#define VERSION_generic_deriving "1.12.4"

160−#endif /* VERSION_generic_deriving */

161−#ifndef MIN_VERSION_generic_deriving

162−#define MIN_VERSION_generic_deriving(major1,major2,minor) (\

163− (major1) < 1 || \

164− (major1) == 1 && (major2) < 12 || \

165− (major1) == 1 && (major2) == 12 && (minor) <= 4)

166−#endif /* MIN_VERSION_generic_deriving */

167−

168−/* package ghc-prim-0.5.3 */

169−#ifndef VERSION_ghc_prim

170−#define VERSION_ghc_prim "0.5.3"

171−#endif /* VERSION_ghc_prim */

172−#ifndef MIN_VERSION_ghc_prim

173−#define MIN_VERSION_ghc_prim(major1,major2,minor) (\

174− (major1) < 0 || \

175− (major1) == 0 && (major2) < 5 || \

176− (major1) == 0 && (major2) == 5 && (minor) <= 3)

177−#endif /* MIN_VERSION_ghc_prim */

178−

179−/* package hashable-1.3.0.0 */

180−#ifndef VERSION_hashable

181−#define VERSION_hashable "1.3.0.0"

182−#endif /* VERSION_hashable */

183−#ifndef MIN_VERSION_hashable

184−#define MIN_VERSION_hashable(major1,major2,minor) (\

185− (major1) < 1 || \

186− (major1) == 1 && (major2) < 3 || \

187− (major1) == 1 && (major2) == 3 && (minor) <= 0)

188−#endif /* MIN_VERSION_hashable */

189−

190−/* package hashable-time-0.2.0.2 */

191−#ifndef VERSION_hashable_time

192−#define VERSION_hashable_time "0.2.0.2"

193−#endif /* VERSION_hashable_time */

194−#ifndef MIN_VERSION_hashable_time

195−#define MIN_VERSION_hashable_time(major1,major2,minor) (\

196− (major1) < 0 || \

197− (major1) == 0 && (major2) < 2 || \

198− (major1) == 0 && (major2) == 2 && (minor) <= 0)

199−#endif /* MIN_VERSION_hashable_time */

200−

201−/* package integer-logarithms-1.0.3 */

202−#ifndef VERSION_integer_logarithms

203−#define VERSION_integer_logarithms "1.0.3"

204−#endif /* VERSION_integer_logarithms */

205−#ifndef MIN_VERSION_integer_logarithms

206−#define MIN_VERSION_integer_logarithms(major1,major2,minor) (\

207− (major1) < 1 || \

208− (major1) == 1 && (major2) < 0 || \

209− (major1) == 1 && (major2) == 0 && (minor) <= 3)

210−#endif /* MIN_VERSION_integer_logarithms */

211−

212−/* package quickcheck-instances-0.3.21 */

213−#ifndef VERSION_quickcheck_instances

214−#define VERSION_quickcheck_instances "0.3.21"

215−#endif /* VERSION_quickcheck_instances */

216−#ifndef MIN_VERSION_quickcheck_instances

217−#define MIN_VERSION_quickcheck_instances(major1,major2,minor) (\

218− (major1) < 0 || \

219− (major1) == 0 && (major2) < 3 || \

220− (major1) == 0 && (major2) == 3 && (minor) <= 21)

221−#endif /* MIN_VERSION_quickcheck_instances */

222−

223−/* package scientific-0.3.6.2 */

224−#ifndef VERSION_scientific

225−#define VERSION_scientific "0.3.6.2"

226−#endif /* VERSION_scientific */

227−#ifndef MIN_VERSION_scientific

228−#define MIN_VERSION_scientific(major1,major2,minor) (\

229− (major1) < 0 || \

230− (major1) == 0 && (major2) < 3 || \

231− (major1) == 0 && (major2) == 3 && (minor) <= 6)

232−#endif /* MIN_VERSION_scientific */

233−

234−/* package tagged-0.8.6 */

235−#ifndef VERSION_tagged

236−#define VERSION_tagged "0.8.6"

237−#endif /* VERSION_tagged */

238−#ifndef MIN_VERSION_tagged

239−#define MIN_VERSION_tagged(major1,major2,minor) (\

240− (major1) < 0 || \

241− (major1) == 0 && (major2) < 8 || \

242− (major1) == 0 && (major2) == 8 && (minor) <= 6)

243−#endif /* MIN_VERSION_tagged */

244−

245−/* package tasty-1.2.3 */

246−#ifndef VERSION_tasty

247−#define VERSION_tasty "1.2.3"

248−#endif /* VERSION_tasty */

249−#ifndef MIN_VERSION_tasty

250−#define MIN_VERSION_tasty(major1,major2,minor) (\

251− (major1) < 1 || \

252− (major1) == 1 && (major2) < 2 || \

253− (major1) == 1 && (major2) == 2 && (minor) <= 3)

254−#endif /* MIN_VERSION_tasty */

255−

256−/* package tasty-golden-2.3.2 */

257−#ifndef VERSION_tasty_golden

258−#define VERSION_tasty_golden "2.3.2"

259−#endif /* VERSION_tasty_golden */

260−#ifndef MIN_VERSION_tasty_golden

261−#define MIN_VERSION_tasty_golden(major1,major2,minor) (\

262− (major1) < 2 || \

263− (major1) == 2 && (major2) < 3 || \

264− (major1) == 2 && (major2) == 3 && (minor) <= 2)

265−#endif /* MIN_VERSION_tasty_golden */

266−

267−/* package tasty-hunit-0.10.0.2 */

268−#ifndef VERSION_tasty_hunit

269−#define VERSION_tasty_hunit "0.10.0.2"

270−#endif /* VERSION_tasty_hunit */

271−#ifndef MIN_VERSION_tasty_hunit

272−#define MIN_VERSION_tasty_hunit(major1,major2,minor) (\

273− (major1) < 0 || \

274− (major1) == 0 && (major2) < 10 || \

275− (major1) == 0 && (major2) == 10 && (minor) <= 0)

276−#endif /* MIN_VERSION_tasty_hunit */

277−

278−/* package tasty-quickcheck-0.10.1 */

279−#ifndef VERSION_tasty_quickcheck

280−#define VERSION_tasty_quickcheck "0.10.1"

281−#endif /* VERSION_tasty_quickcheck */

282−#ifndef MIN_VERSION_tasty_quickcheck

283−#define MIN_VERSION_tasty_quickcheck(major1,major2,minor) (\

284− (major1) < 0 || \

285− (major1) == 0 && (major2) < 10 || \

286− (major1) == 0 && (major2) == 10 && (minor) <= 1)

287−#endif /* MIN_VERSION_tasty_quickcheck */

288−

289−/* package template-haskell-2.14.0.0 */

290−#ifndef VERSION_template_haskell

291−#define VERSION_template_haskell "2.14.0.0"

292−#endif /* VERSION_template_haskell */

293−#ifndef MIN_VERSION_template_haskell

294−#define MIN_VERSION_template_haskell(major1,major2,minor) (\

295− (major1) < 2 || \

296− (major1) == 2 && (major2) < 14 || \

297− (major1) == 2 && (major2) == 14 && (minor) <= 0)

298−#endif /* MIN_VERSION_template_haskell */

299−

300−/* package text-1.2.3.1 */

301−#ifndef VERSION_text

302−#define VERSION_text "1.2.3.1"

303−#endif /* VERSION_text */

304−#ifndef MIN_VERSION_text

305−#define MIN_VERSION_text(major1,major2,minor) (\

306− (major1) < 1 || \

307− (major1) == 1 && (major2) < 2 || \

308− (major1) == 1 && (major2) == 2 && (minor) <= 3)

309−#endif /* MIN_VERSION_text */

310−

311−/* package time-1.8.0.2 */

312−#ifndef VERSION_time

313−#define VERSION_time "1.8.0.2"

314−#endif /* VERSION_time */

315−#ifndef MIN_VERSION_time

316−#define MIN_VERSION_time(major1,major2,minor) (\

317− (major1) < 1 || \

318− (major1) == 1 && (major2) < 8 || \

319− (major1) == 1 && (major2) == 8 && (minor) <= 0)

320−#endif /* MIN_VERSION_time */

321−

322−/* package time-compat-1.9.2.2 */

323−#ifndef VERSION_time_compat

324−#define VERSION_time_compat "1.9.2.2"

325−#endif /* VERSION_time_compat */

326−#ifndef MIN_VERSION_time_compat

327−#define MIN_VERSION_time_compat(major1,major2,minor) (\

328− (major1) < 1 || \

329− (major1) == 1 && (major2) < 9 || \

330− (major1) == 1 && (major2) == 9 && (minor) <= 2)

331−#endif /* MIN_VERSION_time_compat */

332−

333−/* package unordered-containers-0.2.10.0 */

334−#ifndef VERSION_unordered_containers

335−#define VERSION_unordered_containers "0.2.10.0"

336−#endif /* VERSION_unordered_containers */

337−#ifndef MIN_VERSION_unordered_containers

338−#define MIN_VERSION_unordered_containers(major1,major2,minor) (\

339− (major1) < 0 || \

340− (major1) == 0 && (major2) < 2 || \

341− (major1) == 0 && (major2) == 2 && (minor) <= 10)

342−#endif /* MIN_VERSION_unordered_containers */

343−

344−/* package uuid-types-1.0.3 */

345−#ifndef VERSION_uuid_types

346−#define VERSION_uuid_types "1.0.3"

347−#endif /* VERSION_uuid_types */

348−#ifndef MIN_VERSION_uuid_types

349−#define MIN_VERSION_uuid_types(major1,major2,minor) (\

350− (major1) < 1 || \

351− (major1) == 1 && (major2) < 0 || \

352− (major1) == 1 && (major2) == 0 && (minor) <= 3)

353−#endif /* MIN_VERSION_uuid_types */

354−

355−/* package vector-0.12.0.3 */

356−#ifndef VERSION_vector

357−#define VERSION_vector "0.12.0.3"

358−#endif /* VERSION_vector */

359−#ifndef MIN_VERSION_vector

360−#define MIN_VERSION_vector(major1,major2,minor) (\

361− (major1) < 0 || \

362− (major1) == 0 && (major2) < 12 || \

363− (major1) == 0 && (major2) == 12 && (minor) <= 0)

364−#endif /* MIN_VERSION_vector */

365−

366−/* tool gcc-4.2.1 */

367−#ifndef TOOL_VERSION_gcc

368−#define TOOL_VERSION_gcc "4.2.1"

369−#endif /* TOOL_VERSION_gcc */

370−#ifndef MIN_TOOL_VERSION_gcc

371−#define MIN_TOOL_VERSION_gcc(major1,major2,minor) (\

372− (major1) < 4 || \

373− (major1) == 4 && (major2) < 2 || \

374− (major1) == 4 && (major2) == 2 && (minor) <= 1)

375−#endif /* MIN_TOOL_VERSION_gcc */

376−

377−/* tool ghc-8.6.5 */

378−#ifndef TOOL_VERSION_ghc

379−#define TOOL_VERSION_ghc "8.6.5"

380−#endif /* TOOL_VERSION_ghc */

381−#ifndef MIN_TOOL_VERSION_ghc

382−#define MIN_TOOL_VERSION_ghc(major1,major2,minor) (\

383− (major1) < 8 || \

384− (major1) == 8 && (major2) < 6 || \

385− (major1) == 8 && (major2) == 6 && (minor) <= 5)

386−#endif /* MIN_TOOL_VERSION_ghc */

387−

388−/* tool ghc-pkg-8.6.5 */

389−#ifndef TOOL_VERSION_ghc_pkg

390−#define TOOL_VERSION_ghc_pkg "8.6.5"

391−#endif /* TOOL_VERSION_ghc_pkg */

392−#ifndef MIN_TOOL_VERSION_ghc_pkg

393−#define MIN_TOOL_VERSION_ghc_pkg(major1,major2,minor) (\

394− (major1) < 8 || \

395− (major1) == 8 && (major2) < 6 || \

396− (major1) == 8 && (major2) == 6 && (minor) <= 5)

397−#endif /* MIN_TOOL_VERSION_ghc_pkg */

398−

399−/* tool haddock-2.22.0 */

400−#ifndef TOOL_VERSION_haddock

401−#define TOOL_VERSION_haddock "2.22.0"

402−#endif /* TOOL_VERSION_haddock */

403−#ifndef MIN_TOOL_VERSION_haddock

404−#define MIN_TOOL_VERSION_haddock(major1,major2,minor) (\

405− (major1) < 2 || \

406− (major1) == 2 && (major2) < 22 || \

407− (major1) == 2 && (major2) == 22 && (minor) <= 0)

408−#endif /* MIN_TOOL_VERSION_haddock */

409−

410−/* tool hpc-0.67 */

411−#ifndef TOOL_VERSION_hpc

412−#define TOOL_VERSION_hpc "0.67"

413−#endif /* TOOL_VERSION_hpc */

414−#ifndef MIN_TOOL_VERSION_hpc

415−#define MIN_TOOL_VERSION_hpc(major1,major2,minor) (\

416− (major1) < 0 || \

417− (major1) == 0 && (major2) < 67 || \

418− (major1) == 0 && (major2) == 67 && (minor) <= 0)

419−#endif /* MIN_TOOL_VERSION_hpc */

420−

421−/* tool hsc2hs-0.68.5 */

422−#ifndef TOOL_VERSION_hsc2hs

423−#define TOOL_VERSION_hsc2hs "0.68.5"

424−#endif /* TOOL_VERSION_hsc2hs */

425−#ifndef MIN_TOOL_VERSION_hsc2hs

426−#define MIN_TOOL_VERSION_hsc2hs(major1,major2,minor) (\

427− (major1) < 0 || \

428− (major1) == 0 && (major2) < 68 || \

429− (major1) == 0 && (major2) == 68 && (minor) <= 5)

430−#endif /* MIN_TOOL_VERSION_hsc2hs */

431−

432−/* tool runghc-8.6.5 */

433−#ifndef TOOL_VERSION_runghc

434−#define TOOL_VERSION_runghc "8.6.5"

435−#endif /* TOOL_VERSION_runghc */

436−#ifndef MIN_TOOL_VERSION_runghc

437−#define MIN_TOOL_VERSION_runghc(major1,major2,minor) (\

438− (major1) < 8 || \

439− (major1) == 8 && (major2) < 6 || \

440− (major1) == 8 && (major2) == 6 && (minor) <= 5)

441−#endif /* MIN_TOOL_VERSION_runghc */

442−

443−#ifndef CURRENT_COMPONENT_ID

444−#define CURRENT_COMPONENT_ID "aeson-1.4.4.0-inplace-tests"

445−#endif /* CURRENT_COMPONENT_ID */

446−#ifndef CURRENT_PACKAGE_VERSION

447−#define CURRENT_PACKAGE_VERSION "1.4.4.0"

448−#endif /* CURRENT_PACKAGE_VERSION */

travis/install.sh−11

@@ -7,11 +7,6 @@ echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo

7stack --version

9case $BUILD in

10− hlint)

11− echo "Downloading hlint"

12− curl -sSL https://raw.github.com/ndmitchell/hlint/master/misc/run.sh > hlint.sh

13− chmod +x hlint.sh

14− ;;

15 stack)

10 stack)

16 stack --no-terminal --skip-ghc-check setup

11 stack --no-terminal --skip-ghc-check setup

17 stack --no-terminal --skip-ghc-check test --only-snapshot

12 stack --no-terminal --skip-ghc-check test --only-snapshot

@@ -49,10 +44,4 @@ case $BUILD in

49 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;

44 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;

50 fi

45 fi

51 ;;

46 ;;

52− cabal2)

53− cabal v2-update -v

54− sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config

55−

56− cabal v2-build --only-dependencies --enable-tests --enable-benchmarks --dry

57− ;;

58esac

47esac

travis/script.sh+2−4

@@ -19,11 +19,9 @@ case $BUILD in

19 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&

20 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")

21 ;;

22− cabal2)

23− cabal v2-build --enable-tests --enable-benchmarks

24− cabal v2-test --enable-tests --enable-benchmarks

25− ;;

26 hlint)

22 hlint)

23+ stack build --fast aeson --stack-yaml stack-nightly.yaml --system-ghc --no-terminal

24+ stack install hlint --stack-yaml stack-nightly.yaml --system-ghc --no-terminal

27 make lint

25 make lint

28 ;;

26 ;;

29esac

27esac