master..cd4ce04 · typeable/aeson

git.iko.soy/typeable/aeson

36 files changed+290−938

unifiedsplit

.gitignore−1 .hlint.yaml+1−6 .travis.yml+23−34 CONTRIBUTING.md−38 Data/Aeson/Compat.hs+16 Data/Aeson/TH.hs+38−24 Data/Aeson/Types.hs−8 Data/Aeson/Types/FromJSON.hs+67−90 Data/Aeson/Types/Internal.hs+5−26 Data/Aeson/Types/ToJSON.hs+43−3 Makefile+1−1 aeson.cabal+15−9 attoparsec-iso8601/Data/Attoparsec/Time/Internal.hs+20 attoparsec-iso8601/attoparsec-iso8601.cabal+2−2 benchmarks/AesonEncode.hs+1−1 benchmarks/Compare/JsonBench.hs+1−2 benchmarks/aeson-benchmarks.cabal+1 cabal.project+1−3 changelog.md−21 run-hlint.sh−7 stack-bench.yaml+8−2 stack-ffi-unescape.yaml+7−2 stack-nightly.yaml+4−2 tests/Encoders.hs+6−25 tests/ErrorMessages.hs+1−27 tests/Instances.hs+4−1 tests/Options.hs−11 tests/PropertyGeneric.hs+8 tests/PropertyKeys.hs+3 tests/SerializationFormatSpec.hs+4 tests/Types.hs+2 tests/UnitTests.hs+3−118 tests/golden/generic.expected+3−11 travis/cabal_macros.h−448 travis/install.sh−11 travis/script.sh+2−4

.gitignore−1

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

55cabal.sandbox.config

66.stack-work/

77.stack-work-bench/

8−*.yaml.lock

109*.o

1110*.hi

.hlint.yaml+1−6

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

33 name: "Reduce duplication"

44 within:

55 - Data.Aeson.Types.ToJSON

6−- ignore:

7− name: "Eta reduce"

8−- ignore:

9− name: "Use newtype instead of data"

10− within:

11− - Data.Aeson.Types.Internal

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

.travis.yml+23−34

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

1212 - $HOME/.stack

1313 - $HOME/.cabsnap

1414 - $HOME/.cabal/packages

15− - $HOME/.cabal/store

1615

1716before_cache:

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

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

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

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

2419

2520matrix:

2621 include:

27−

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

29− compiler: ": #GHC 8.4.4"

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

31−

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

33− compiler: ": #GHC 8.6.5"

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

35−

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

37− compiler: ": #GHC 8.6.5"

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

39−

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

45− compiler: ": #GHC 8.6.5"

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

47−

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

49− compiler: ": #GHC 8.4.4"

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

51−

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

23+ compiler: ": #GHC 8.4.3"

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

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

26+ compiler: ": #GHC 8.4.3"

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

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

29+ compiler: ": #GHC 8.4.3"

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

31+

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

33+ compiler: ": #GHC 8.6.1"

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

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

36+ compiler: ": #GHC 8.4.3"

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

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

5339 compiler: ": #GHC 8.2.2"

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

55−

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

5742 compiler: ": #GHC 8.0.2"

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

59−

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

6145 compiler: ": #GHC 7.10.3"

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

63−

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

6548 compiler: ": #GHC 7.8.4"

6649 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]}}

6756

6857before_install:

6958 - unset CC

CONTRIBUTING.md−38

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

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

5959import qualified A

6060```

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/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/TH.hs+38−24

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

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

136136import qualified Data.Monoid as Monoid

137137import Data.Set (Set)

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

138139import Language.Haskell.TH hiding (Arity)

140+#else

141+import Language.Haskell.TH

142+#endif

139143import 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

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

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

142149#endif

143150import Text.Printf (printf)

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

145152import 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)

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

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

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

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

922929 -> Name

923930 -> [Name]

924931 -> Name

925− -> Bool

926932 -> ExpQ

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

928− (if rejectUnknownFields opts

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

930− else id) $

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

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

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

933936 xs

934937 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− ]

951938 x:xs = [ [|lookupField|]

952939 `appE` dispatchParseJSON jc conName tvMap argTy

953940 `appE` litE (stringL $ show tName)

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

10221009 , constructorFields = argTys }

10231010 (Left (_, obj)) = do

10241011 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

10261013parseArgs jc tvMap tName opts

10271014 info@ConstructorInfo { constructorName = conName

10281015 , constructorVariant = RecordConstructor fields

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

10371024 argTys' <- mapM resolveTypeSynonyms argTys

10381025 caseE (varE valName)

10391026 [ 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) []

10411028 , matchFailed tName conName "Object"

10421029 ]

10431030

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

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

16041591hasKindStar :: Type -> Bool

16051592hasKindStar VarT{} = True

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

16061594hasKindStar (SigT _ StarT) = True

1595+#else

1596+hasKindStar (SigT _ StarK) = True

1597+#endif

16071598hasKindStar _ = False

16081599

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

16101601isStarOrVar :: Kind -> Bool

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

16111603isStarOrVar StarT = True

16121604isStarOrVar VarT{} = True

1605+#else

1606+isStarOrVar StarK = True

1607+#endif

16131608isStarOrVar _ = False

16141609

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

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

16671662#else

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

16691664#endif

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

16701666 FamilyI ClosedTypeFamilyD{} _ -> True

1667+#endif

16711668 _ -> False

16721669isTyFamily _ = return False

16731670

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

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

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

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

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

16981696 || go _k names

1697+#endif

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

17001699 go _ _ = False

17011700

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

17511750

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

17531752uncurryKind :: Kind -> NonEmpty Kind

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

17541754uncurryKind = snd . uncurryTy

1755+#else

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

1757+uncurryKind k = k :| []

1758+#endif

17551759

17561760createKindChain :: Int -> Kind

17571761createKindChain = go starK

17581762 where

17591763 go :: Kind -> Int -> Kind

17601764 go k 0 = k

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

17611766 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

17621770

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

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

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

18121820-------------------------------------------------------------------------------

18131821

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

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

18151824applySubstitutionKind = applySubstitution

1825+#else

1826+applySubstitutionKind _ t = t

1827+#endif

18161828

18171829substNameWithKind :: Name -> Kind -> Type -> Type

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

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

19761988canRealizeKindStar :: Type -> StarKindStatus

19771989canRealizeKindStar t = case t of

19781990 _ | hasKindStar t -> KindStar

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

19791992 SigT _ (VarT k) -> IsKindVar k

1993+#endif

19801994 _ -> NotKindStar

19811995

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

Data/Aeson/Types.hs−8

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

124124 , sumEncoding

125125 , unwrapUnaryRecords

126126 , tagSingleConstructors

127− , rejectUnknownFields

128127

129128 -- ** Options utilities

130129 , SumEncoding(..)

@@ -137,13 +136,6 @@ module Data.Aeson.Types

137136 , JSONKeyOptions

138137 , keyModifier

139138 , defaultJSONKeyOptions

140−

141− -- * Parsing context

142− , (<?>)

143− , JSONPath

144− , JSONPathElement(..)

145− , formatPath

146− , formatRelativePath

147139 ) where

148140

149141import Prelude.Compat

Data/Aeson/Types/FromJSON.hs+67−90

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

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE GADTs #-}

77{-# LANGUAGE MultiParamTypeClasses #-}

8+{-# LANGUAGE NamedFieldPuns #-}

89{-# LANGUAGE NoImplicitPrelude #-}

910{-# LANGUAGE OverloadedStrings #-}

10−{-# LANGUAGE PolyKinds #-}

1111{-# LANGUAGE RecordWildCards #-}

1212{-# LANGUAGE ScopedTypeVariables #-}

1313{-# LANGUAGE TypeOperators #-}

14−{-# LANGUAGE TupleSections #-}

1514{-# LANGUAGE UndecidableInstances #-}

1615{-# LANGUAGE ViewPatterns #-}

1716

17+#if __GLASGOW_HASKELL__ >= 706

18+{-# LANGUAGE PolyKinds #-}

19+#endif

20+

1821#include "incoherent-compat.h"

1922#include "overlapping-compat.h"

2023

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

118121import Numeric.Natural (Natural)

119122import Text.ParserCombinators.ReadP (readP_to_S)

120123import Unsafe.Coerce (unsafeCoerce)

124+import qualified Data.Aeson.Compat as Compat

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

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

123−import qualified Data.ByteString.Lazy as L

124127import qualified Data.DList as DList

125128import qualified Data.HashMap.Strict as H

126129import qualified Data.HashSet as HashSet

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

155158import qualified Data.Primitive.PrimArray as PM

156159#endif

157160

161+#ifndef HAS_COERCIBLE

162+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)

163+#endif

158164

165+#if HAS_COERCIBLE

159166import Data.Coerce (Coercible, coerce)

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

168+coerce' = coerce

169+#else

170+coerce' :: a -> b

171+coerce' = unsafeCoerce

172+#endif

160173

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

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

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

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

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

430443data CoerceText a where

444+#if HAS_COERCIBLE

431445 CoerceText :: Coercible Text a => CoerceText a

446+#else

447+ CoerceText :: CoerceText a

448+#endif

432449

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

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

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

448465

449466-- | Only law abiding up to interpretation

450467instance Functor FromJSONKeyFunction where

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

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

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

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

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

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

462479--

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

464481fromJSONKeyCoerce ::

482+#if HAS_COERCIBLE

465483 Coercible Text a =>

484+#endif

466485 FromJSONKeyFunction a

467486fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText

468487

@@ -470,18 +489,29 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText

470489--

471490-- See note on 'fromJSONKeyCoerce'.

472491coerceFromJSONKeyFunction ::

492+#if HAS_COERCIBLE

473493 Coercible a b =>

494+#endif

474495 FromJSONKeyFunction a -> FromJSONKeyFunction b

496+#if HAS_COERCIBLE

475497coerceFromJSONKeyFunction = coerce

498+#else

499+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText

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

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

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

503+#endif

476504

477505{-# RULES

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

479507 fmap id x = x

480508 #-}

509+#if HAS_COERCIBLE

481510{-# RULES

482511 "FromJSONKeyCoerce: fmap coerce" forall x .

483512 fmap coerce x = coerceFromJSONKeyFunction x

484513 #-}

514+#endif

485515

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

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

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

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

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

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

771−withBoundedScientific_ whenFail f (Number scientific) =

772− if exp10 > 1024

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

802+ if exponent > 1024

773803 then whenFail (fail msg)

774804 else f scientific

775805 where

776− exp10 = base10Exponent scientific

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

806+ exponent = base10Exponent scientific

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

778808withBoundedScientific_ whenFail _ v =

779809 whenFail (typeMismatch "Number" v)

780810{-# INLINE withBoundedScientific_ #-}

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

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

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

796826withEmbeddedJSON _ innerParser (String txt) =

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

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

798828 where

799829 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON

800830 eitherFormatError = either (Left . uncurry formatError) Right

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

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

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

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

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

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

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

868898{-# INLINE explicitParseField #-}

869899

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

922952contextType :: TypeName -> Parser a -> Parser a

923953contextType = prependContext

924954

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−

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

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

937957contextCons cname tname = prependContext (showCons cname tname)

@@ -1110,8 +1130,8 @@ instance ConstructorNames a => ConstructorNames (D1 d a) where

11101130 retag (Tagged2 x) = Tagged2 x

11111131

11121132--------------------------------------------------------------------------------

1113−parseNonAllNullarySum :: forall f c arity.

1114− ( FromPair arity f

1133+

1134+parseNonAllNullarySum :: ( FromPair arity f

11151135 , FromTaggedObject arity f

11161136 , FromUntaggedValue arity f

11171137 , ConstructorNames f

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

11211141 case sumEncoding opts of

11221142 TaggedObject{..} ->

11231143 withObject tname $ \obj -> do

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

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

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

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

11271147 where

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

11291149 badTag tag = failWith_ $ \cnames ->

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

11311151 ", but found tag " ++ show tag

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

11331152

11341153 ObjectWithSingleField ->

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

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

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

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

12031222

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

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

12051224 -- Records are unpacked in the tagged object

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

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

12071226

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

12091228 -- Nonnullary nonrecords are encoded in the contents field

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

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

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

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

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

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

12481267

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

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

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

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

12521271

12531272instance OVERLAPPING_

12541273 ConsFromJSON' arity U1 False where

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

12741293

12751294--------------------------------------------------------------------------------

12761295

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−

12881296class RecordFromJSON arity f where

12891297 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'

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

13141299 -> Object -> Parser (f a)

13151300

1316−instance ( RecordFromJSON' arity a

1317− , RecordFromJSON' arity b

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

1319− recordParseJSON' p obj =

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

1321− <*> recordParseJSON' p obj

1301+instance ( RecordFromJSON arity a

1302+ , RecordFromJSON arity b

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

1304+ recordParseJSON p obj =

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

1306+ <*> recordParseJSON p obj

13221307

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

1324− RecordFromJSON' arity (S1 s a) where

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

1309+ RecordFromJSON arity (S1 s a) where

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

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

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

13281313 where

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

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

13311316

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

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

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

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

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

13351320 where

13361321 label = fieldLabelModifier opts sname

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

13381323

13391324-- Parse an Option like a Maybe.

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

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

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

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

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

13431328 where

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

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

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

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

15771562

15781563instance (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

1590− numerator <- obj .: "numerator"

1591− denominator <- obj .: "denominator"

1592− if denominator == 0

1593− then fail "Ratio denominator was 0"

1594− else pure $ numerator % denominator

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

1565+ numerator <- obj .: "numerator"

1566+ denominator <- obj .: "denominator"

1567+ if denominator == 0

1568+ then fail "Ratio denominator was 0"

1569+ else pure $ numerator % denominator

15951570 {-# INLINE parseJSON #-}

15961571

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

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

20061981-- primitive

20071982-------------------------------------------------------------------------------

20081983

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

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

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

20111987 -- constructor in Data.Vector.

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

20231999 parseJSON = fmap Exts.fromList . parseJSON

20242000#endif

20252001#endif

2002+#endif

20262003

20272004-------------------------------------------------------------------------------

20282005-- time

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

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

4949 , parserThrowError

5050 , parserCatchError

5151 , formatError

52− , formatPath

53− , formatRelativePath

5452 , (<?>)

5553 -- * Constructors and accessors

5654 , object

@@ -64,7 +62,6 @@ module Data.Aeson.Types.Internal

6462 , sumEncoding

6563 , unwrapUnaryRecords

6664 , tagSingleConstructors

67− , rejectUnknownFields

6865 )

6966

7067 , SumEncoding(..)

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

10299import Data.Typeable (Typeable)

103100import Data.Vector (Vector)

104101import GHC.Generics (Generic)

105−import qualified Control.Monad as Monad

106102import qualified Control.Monad.Fail as Fail

107103import qualified Data.HashMap.Strict as H

108104import qualified Data.Scientific as S

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

156152 fmap _ (Error err) = Error err

157153 {-# INLINE fmap #-}

158154

159−instance Monad.Monad IResult where

155+instance Monad IResult where

160156 return = pure

161157 {-# INLINE return #-}

162158

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

173169 fail err = IError [] err

174170 {-# INLINE fail #-}

175171

176−instance Monad.Monad Result where

172+instance Monad Result where

177173 return = pure

178174 {-# INLINE return #-}

179175

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

292288 -> f r

293289 }

294290

295−instance Monad.Monad Parser where

291+instance Monad Parser where

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

297293 in runParser m path kf ks'

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

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

461457-- | Annotate an error message with a

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

463459formatError :: JSONPath -> String -> String

464−formatError path msg = "Error in " ++ formatPath 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

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

475461 where

476462 format :: String -> JSONPath -> String

477463 format pfx [] = pfx

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

625611 , tagSingleConstructors :: Bool

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

627613 -- 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.

632614 }

633615

634616instance Show Options where

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

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

636618 "Options {"

637619 ++ intercalate ", "

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

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

642624 , "sumEncoding = " ++ show s

643625 , "unwrapUnaryRecords = " ++ show u

644626 , "tagSingleConstructors = " ++ show t

645− , "rejectUnknownFields = " ++ show r

646627 ]

647628 ++ "}"

648629

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

724705-- , 'sumEncoding' = 'defaultTaggedObject'

725706-- , 'unwrapUnaryRecords' = False

726707-- , 'tagSingleConstructors' = False

727−-- , 'rejectUnknownFields' = False

728708-- }

729709-- @

730710defaultOptions :: Options

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

736716 , sumEncoding = defaultTaggedObject

737717 , unwrapUnaryRecords = False

738718 , tagSingleConstructors = False

739− , rejectUnknownFields = False

740719 }

741720

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

Data/Aeson/Types/ToJSON.hs+43−3

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

55{-# LANGUAGE FlexibleInstances #-}

66{-# LANGUAGE FunctionalDependencies #-}

77{-# LANGUAGE GADTs #-}

8+{-# LANGUAGE NamedFieldPuns #-}

89{-# LANGUAGE NoImplicitPrelude #-}

910{-# LANGUAGE OverloadedStrings #-}

1011{-# LANGUAGE PatternGuards #-}

11−{-# LANGUAGE PolyKinds #-}

1212{-# LANGUAGE RecordWildCards #-}

1313{-# LANGUAGE ScopedTypeVariables #-}

1414{-# LANGUAGE TypeOperators #-}

1515{-# LANGUAGE UndecidableInstances #-}

1616

17+#if __GLASGOW_HASKELL__ >= 706

18+{-# LANGUAGE PolyKinds #-}

19+#endif

20+

1721#include "overlapping-compat.h"

1822#include "incoherent-compat.h"

1923

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

100104import Numeric.Natural (Natural)

101105import qualified Data.Aeson.Encoding as E

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

107+import qualified Data.ByteString as S

103108import qualified Data.ByteString.Lazy as L

104109import qualified Data.DList as DList

105110import qualified Data.HashMap.Strict as H

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

140145import qualified Data.Primitive.PrimArray as PM

141146#endif

142147

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

149+import Foreign.ForeignPtr (withForeignPtr)

150+import Foreign.Marshal.Utils (copyBytes)

151+import Foreign.Ptr (plusPtr)

152+import qualified Data.ByteString.Internal as S

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

154+#endif

155+

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

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

145158{-# INLINE toJSONPair #-}

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

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

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

505518 . T.decodeLatin1

506− . L.toStrict

519+ . lazyToStrictByteString

507520 . E.encodingToLazyByteString

508521 . e

509522

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

19701983-- primitive

19711984-------------------------------------------------------------------------------

19721985

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

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

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

19751989 -- constructor in Data.Vector.

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

19912005 toEncoding = toEncoding . Exts.toList

19922006#endif

19932007#endif

2008+#endif

19942009

19952010-------------------------------------------------------------------------------

19962011-- time

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

20402055stringEncoding = String

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

20422057 . T.decodeLatin1

2043− . L.toStrict

2058+ . lazyToStrictByteString

20442059 . E.encodingToLazyByteString

20452060{-# INLINE stringEncoding #-}

20462061

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

28472862 toEncoding = toEncoding2

28482863 {-# INLINE toEncoding #-}

28492864

2865+-------------------------------------------------------------------------------

2866+-- pre-bytestring-0.10 compatibility

2867+-------------------------------------------------------------------------------

2868+

2869+{-# INLINE lazyToStrictByteString #-}

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

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

2872+lazyToStrictByteString = L.toStrict

2873+#else

2874+lazyToStrictByteString = packChunks

2875+

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

2877+

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

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

2880+packChunks lbs =

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

2882+ where

2883+ copyChunks L.Empty _pf = return ()

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

2885+ withForeignPtr fpbuf $ \pbuf ->

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

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

2888+#endif

2889+

28502890--------------------------------------------------------------------------------

28512891

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

Makefile+1−1

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

11lint:

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+15−9

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

11name: aeson

2−version: 1.4.6.0

2+version: 1.4.4.0

33license: BSD3

44license-file: LICENSE

55category: Text, Web, JSON

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

8888 Data.Aeson.Encode

8989

9090 other-modules:

91+ Data.Aeson.Compat

9192 Data.Aeson.Encoding.Builder

9293 Data.Aeson.Internal.Functions

9394 Data.Aeson.Parser.Unescape

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

102103

103104 -- GHC bundled libs

104105 build-depends:

105− base >= 4.7.0.0 && < 5,

106− bytestring >= 0.10.4.0 && < 0.11,

107− containers >= 0.5.5.1 && < 0.7,

106+ base >= 4.5.0.0 && < 5,

107+ containers >= 0.4.2.1 && < 0.7,

108108 deepseq >= 1.3.0.0 && < 1.5,

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

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

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

111111 text >= 1.2.3.0 && < 1.3,

112− time >= 1.4 && < 1.10

112+ time >= 1.4 && < 1.9

113113

114114 if impl(ghc >= 8.0)

115115 build-depends: bytestring >= 0.10.8.1

116116

117117 -- Compat

118118 build-depends:

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

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

120120 time-compat >= 1.9.2.2 && < 1.10

121121

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+

122128 if !impl(ghc >= 8.6)

123129 build-depends:

124130 contravariant >=1.4.1 && <1.6

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

219225 containers,

220226 directory,

221227 dlist,

222− Diff >= 0.4 && < 0.5,

228+ Diff,

223229 filepath,

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

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

225231 ghc-prim >= 0.2,

226232 hashable >= 1.2.4.0,

227233 scientific,

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

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

2929

3030#endif

3131

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

33+

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

3335

36+#else

37+

38+import Data.Fixed (Pico)

39+

40+#endif

41+

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

3543

3644diffTimeToPicoseconds :: DiffTime -> Integer

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

3846

3947#endif

4048

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

50+

4151toPico :: Integer -> Pico

4252toPico = MkFixed

4353

4454fromPico :: Pico -> Integer

4555fromPico (MkFixed i) = i

4656

57+#else

58+

59+toPico :: Integer -> Pico

60+toPico = unsafeCoerce

61+

62+fromPico :: Pico -> Integer

63+fromPico = unsafeCoerce

64+

65+#endif

66+

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

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

4969 {-# UNPACK #-} !Int

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

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

3636 Data.Attoparsec.Time

3737 build-depends:

3838 attoparsec >= 0.13.0.1,

39− base >= 4.7 && < 5,

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

39+ base >= 4.5 && < 5,

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

4141 text >= 1.1.1.0,

4242 time >= 1.1.1.4

4343

benchmarks/AesonEncode.hs+1−1

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

77import Prelude.Compat

99import Control.DeepSeq

10−import Control.Monad (forM_)

10+import Control.Monad

1111import Data.Aeson

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

1313import Data.Char (isDigit)

benchmarks/Compare/JsonBench.hs+1−2

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

2020import Data.Monoid ((<>))

2121import Data.Text (Text)

2222import Typed.Common (load)

23−import qualified Control.Monad.Fail as Fail

2423import qualified Data.Aeson as Aeson

2524import qualified Data.BufferBuilder.Json as Json

2625

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

8382fruitTable :: [(Text, Fruit)]

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

8584

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

8786enumFromJson enumName table extract v = do

8887 s <- extract v

8988 case lookup s table of

benchmarks/aeson-benchmarks.cabal+1

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

7272

7373 exposed-modules:

7474 Data.Aeson

75+ Data.Aeson.Compat

7576 Data.Aeson.Encoding

7677 Data.Aeson.Encoding.Builder

7778 Data.Aeson.Encoding.Internal

cabal.project+1−3

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

11with-compiler: ghc

22packages: .

3−packages: attoparsec-iso8601

4−-- packages: benchmarks

5−tests: true

3+packages: attoparsec-iso8601, benchmarks

changelog.md−21

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

11For 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−

243### 1.4.4.0

254

265**New features**:

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

22# We use aeson in the snapshot to

33# - avoid recompilation of criterion

44# - compare against it

@@ -9,4 +9,10 @@ resolver: nightly-2019-09-21

99work-dir: .stack-work-bench

1010packages:

1111- 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

22packages:

33- '.'

44flags:

@@ -6,4 +6,9 @@ flags:

66 fast: true

77 cffi: true

88extra-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

22packages:

33- '.'

44- attoparsec-iso8601

@@ -8,4 +8,6 @@ flags:

88 attoparsec-iso8601:

99 fast: true

1010extra-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−25

@@ -188,6 +188,7 @@ gSomeTypeToEncoding2ElemArray = genericToEncoding opts2ElemArray

188188gSomeTypeParseJSON2ElemArray :: Value -> Parser (SomeType Int)

189189gSomeTypeParseJSON2ElemArray = genericParseJSON opts2ElemArray

190190

191+#if __GLASGOW_HASKELL__ >= 706

191192gSomeTypeLiftToEncoding2ElemArray :: LiftToEncoding SomeType a

192193gSomeTypeLiftToEncoding2ElemArray = genericLiftToEncoding opts2ElemArray

193194

@@ -196,6 +197,7 @@ gSomeTypeLiftToJSON2ElemArray = genericLiftToJSON opts2ElemArray

196197

197198gSomeTypeLiftParseJSON2ElemArray :: LiftParseJSON SomeType a

198199gSomeTypeLiftParseJSON2ElemArray = genericLiftParseJSON opts2ElemArray

200+#endif

199201

200202

201203gSomeTypeToJSONTaggedObject :: SomeType Int -> Value

@@ -207,6 +209,7 @@ gSomeTypeToEncodingTaggedObject = genericToEncoding optsTaggedObject

207209gSomeTypeParseJSONTaggedObject :: Value -> Parser (SomeType Int)

208210gSomeTypeParseJSONTaggedObject = genericParseJSON optsTaggedObject

209211

212+#if __GLASGOW_HASKELL__ >= 706

210213gSomeTypeLiftToEncodingTaggedObject :: LiftToEncoding SomeType a

211214gSomeTypeLiftToEncodingTaggedObject = genericLiftToEncoding optsTaggedObject

212215

@@ -215,6 +218,7 @@ gSomeTypeLiftToJSONTaggedObject = genericLiftToJSON optsTaggedObject

215218

216219gSomeTypeLiftParseJSONTaggedObject :: LiftParseJSON SomeType a

217220gSomeTypeLiftParseJSONTaggedObject = genericLiftParseJSON optsTaggedObject

221+#endif

218222

219223

220224gSomeTypeToJSONObjectWithSingleField :: SomeType Int -> Value

@@ -226,6 +230,7 @@ gSomeTypeToEncodingObjectWithSingleField = genericToEncoding optsObjectWithSingl

226230gSomeTypeParseJSONObjectWithSingleField :: Value -> Parser (SomeType Int)

227231gSomeTypeParseJSONObjectWithSingleField = genericParseJSON optsObjectWithSingleField

228232

233+#if __GLASGOW_HASKELL__ >= 706

229234gSomeTypeLiftToEncodingObjectWithSingleField :: LiftToEncoding SomeType a

230235gSomeTypeLiftToEncodingObjectWithSingleField = genericLiftToEncoding optsObjectWithSingleField

231236

@@ -234,6 +239,7 @@ gSomeTypeLiftToJSONObjectWithSingleField = genericLiftToJSON optsObjectWithSingl

234239

235240gSomeTypeLiftParseJSONObjectWithSingleField :: LiftParseJSON SomeType a

236241gSomeTypeLiftParseJSONObjectWithSingleField = genericLiftParseJSON optsObjectWithSingleField

242+#endif

237243

238244

239245gSomeTypeToJSONOmitNothingFields :: SomeType Int -> Value

@@ -243,31 +249,6 @@ gSomeTypeToEncodingOmitNothingFields :: SomeType Int -> Encoding

243249gSomeTypeToEncodingOmitNothingFields = genericToEncoding optsOmitNothingFields

244250

245251

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−

271252--------------------------------------------------------------------------------

272253-- Option fields

273254--------------------------------------------------------------------------------

tests/ErrorMessages.hs+1−27

@@ -13,7 +13,7 @@ import Data.Aeson (FromJSON(..), Value, json)

1313import Data.Aeson.Types (Parser)

1414import Data.Aeson.Parser (eitherDecodeWith)

1515import Data.Aeson.Internal (formatError, iparse)

16−import Data.Algorithm.Diff (PolyDiff (..), getGroupedDiff)

16+import Data.Algorithm.Diff (Diff(..), getGroupedDiff)

1717import Data.Proxy (Proxy(..))

1818import Data.Semigroup ((<>))

1919import Data.Sequence (Seq)

@@ -136,29 +136,6 @@ outputGeneric choice = concat

136136 , "[1,"

137137 ]

138138

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−

162139 , testWith "EitherTextInt"

163140 (select

164141 thEitherTextIntParseJSONUntaggedValue

@@ -219,6 +196,3 @@ testFor name _ = testWith name (parseJSON :: Value -> Parser a)

219196

220197testWithSomeType :: String -> (Value -> Parser (SomeType Int)) -> [L.ByteString] -> Output

221198testWithSomeType = 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 #-}

12{-# LANGUAGE FlexibleContexts #-}

23{-# LANGUAGE FlexibleInstances #-}

34{-# LANGUAGE NoImplicitPrelude #-}

@@ -24,12 +25,14 @@ import qualified Data.HashMap.Strict as HM

2425

2526import Data.Orphans ()

2627import Test.QuickCheck.Instances ()

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

2729import Data.Hashable.Time ()

30+#endif

2831

2932-- "System" types.

3033

3134instance Arbitrary DotNetTime where

32− arbitrary = DotNetTime `fmap` arbitrary

35+ arbitrary = DotNetTime `liftM` arbitrary

3336 shrink = map DotNetTime . shrink . fromDotNetTime

3437

3538-- | Compare timezone part only on 'timeZoneMinutes'

tests/Options.hs−11

@@ -55,14 +55,3 @@ optsOptionField = optsDefault

5555 { fieldLabelModifier = const "field"

5656 , omitNothingFields = True

5757 }

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 =

4444 , testProperty "TaggedObject" (toParseJSON gSomeTypeParseJSONTaggedObject gSomeTypeToJSONTaggedObject)

4545 , testProperty "ObjectWithSingleField" (toParseJSON gSomeTypeParseJSONObjectWithSingleField gSomeTypeToJSONObjectWithSingleField)

4646

47+#if __GLASGOW_HASKELL__ >= 706

4748 , testProperty "2ElemArray unary" (toParseJSON1 gSomeTypeLiftParseJSON2ElemArray gSomeTypeLiftToJSON2ElemArray)

4849 , testProperty "TaggedObject unary" (toParseJSON1 gSomeTypeLiftParseJSONTaggedObject gSomeTypeLiftToJSONTaggedObject)

4950 , testProperty "ObjectWithSingleField unary" (toParseJSON1 gSomeTypeLiftParseJSONObjectWithSingleField gSomeTypeLiftToJSONObjectWithSingleField)

51+#endif

5052 ]

5153 ]

5254 , testGroup "OneConstructor" [

@@ -83,24 +85,30 @@ genericTests =

8385

8486 , testProperty "SomeType2ElemArray" $

8587 gSomeTypeToJSON2ElemArray `sameAs` gSomeTypeToEncoding2ElemArray

88+#if __GLASGOW_HASKELL__ >= 706

8689 , testProperty "SomeType2ElemArray unary" $

8790 gSomeTypeLiftToJSON2ElemArray `sameAs1` gSomeTypeLiftToEncoding2ElemArray

8891 , testProperty "SomeType2ElemArray unary agree" $

8992 gSomeTypeToEncoding2ElemArray `sameAs1Agree` gSomeTypeLiftToEncoding2ElemArray

93+#endif

9094

9195 , testProperty "SomeTypeTaggedObject" $

9296 gSomeTypeToJSONTaggedObject `sameAs` gSomeTypeToEncodingTaggedObject

97+#if __GLASGOW_HASKELL__ >= 706

9398 , testProperty "SomeTypeTaggedObject unary" $

9499 gSomeTypeLiftToJSONTaggedObject `sameAs1` gSomeTypeLiftToEncodingTaggedObject

95100 , testProperty "SomeTypeTaggedObject unary agree" $

96101 gSomeTypeToEncodingTaggedObject `sameAs1Agree` gSomeTypeLiftToEncodingTaggedObject

102+#endif

97103

98104 , testProperty "SomeTypeObjectWithSingleField" $

99105 gSomeTypeToJSONObjectWithSingleField `sameAs` gSomeTypeToEncodingObjectWithSingleField

106+#if __GLASGOW_HASKELL__ >= 706

100107 , testProperty "SomeTypeObjectWithSingleField unary" $

101108 gSomeTypeLiftToJSONObjectWithSingleField `sameAs1` gSomeTypeLiftToEncodingObjectWithSingleField

102109 , testProperty "SomeTypeObjectWithSingleField unary agree" $

103110 gSomeTypeToEncodingObjectWithSingleField `sameAs1Agree` gSomeTypeLiftToEncodingObjectWithSingleField

111+#endif

104112

105113 , testProperty "SomeTypeOmitNothingFields" $

106114 gSomeTypeToJSONOmitNothingFields `sameAs` gSomeTypeToEncodingOmitNothingFields

tests/PropertyKeys.hs+3

@@ -1,3 +1,4 @@

1+{-# LANGUAGE CPP #-}

12{-# LANGUAGE NoImplicitPrelude #-}

34module PropertyKeys ( keysTests ) where

@@ -30,10 +31,12 @@ keysTests =

3031 , testProperty "Natural" $ roundTripKey (undefined :: Natural)

3132 , testProperty "Float" $ roundTripKey (undefined :: Float)

3233 , testProperty "Double" $ roundTripKey (undefined :: Double)

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

3335 , testProperty "Day" $ roundTripKey (undefined :: Day)

3436 , testProperty "LocalTime" $ roundTripKey (undefined :: LocalTime)

3537 , testProperty "TimeOfDay" $ roundTripKey (undefined :: TimeOfDay)

3638 , testProperty "UTCTime" $ roundTripKey (undefined :: UTCTime)

39+#endif

3740 , testProperty "Version" $ roundTripKey (undefined :: Version)

3841 , testProperty "Lazy Text" $ roundTripKey (undefined :: LT.Text)

3942 , testProperty "UUID" $ roundTripKey UUID.nil

tests/SerializationFormatSpec.hs+4

@@ -3,7 +3,9 @@

33{-# LANGUAGE GADTs #-}

44{-# LANGUAGE NoImplicitPrelude #-}

55{-# LANGUAGE OverloadedStrings #-}

6+#if __GLASGOW_HASKELL__ >= 708

67{-# LANGUAGE DataKinds #-}

8+#endif

810------------------------------------------------------------------------------

911-- These tests assert that the JSON serialization doesn't change by accident.

@@ -75,8 +77,10 @@ jsonExamples =

7577 , example "Just" "1" (Just 1 :: Maybe Int)

7678 , example "Proxy Int" "null" (Proxy :: Proxy Int)

7779 , example "Tagged Char Int" "1" (Tagged 1 :: Tagged Char Int)

80+#if __GLASGOW_HASKELL__ >= 708

7881 -- Test Tagged instance is polykinded

7982 , example "Tagged 123 Int" "1" (Tagged 1 :: Tagged 123 Int)

83+#endif

8084 , example "Const Char Int" "\"c\"" (Const 'c' :: Const Char Int)

8185 , example "Tuple" "[1,2]" ((1, 2) :: (Int, Int))

8286 , 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)

119119deriving instance Generic (Approx a)

120120deriving instance Generic Nullary

121121deriving instance Generic (SomeType a)

122+#if __GLASGOW_HASKELL__ >= 706

122123deriving instance Generic1 SomeType

124+#endif

123125deriving instance Generic OptionField

124126deriving instance Generic EitherTextInt

125127

tests/UnitTests.hs+3−118

@@ -33,15 +33,14 @@ import Data.Aeson.Parser

3333 ( json, jsonLast, jsonAccum, jsonNoDup

3434 , json', jsonLast', jsonAccum', jsonNoDup')

3535import 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)

36+ ( Options(..), Result(Success), ToJSON(..), Value(Array, Bool, Null, Object)

37+ , camelTo, camelTo2, defaultOptions, omitNothingFields, parse)

3938import Data.Attoparsec.ByteString (Parser, parseOnly)

4039import Data.Char (toUpper)

4140import Data.Either.Compat (isLeft, isRight)

4241import Data.Hashable (hash)

4342import Data.HashMap.Strict (HashMap)

44−import Data.List (sort, isSuffixOf)

43+import Data.List (sort)

4544import Data.Maybe (fromMaybe)

4645import Data.Scientific (Scientific, scientific)

4746import Data.Tagged (Tagged(..))

@@ -112,12 +111,8 @@ tests = testGroup "unit" [

112111 , testGroup "SingleMaybeField" singleMaybeField

113112 , testCase "withEmbeddedJSON" withEmbeddedJSONTest

114113 , testCase "SingleFieldCon" singleFieldCon

115− , testGroup "UnknownFields" unknownFields

116114 , testGroup "Ordering of object keys" keyOrdering

117115 , testCase "Ratio with denominator 0" ratioDenominator0

118− , testCase "Rational parses number" rationalNumber

119− , testCase "Big rational" bigRationalDecoding

120− , testCase "Small rational" smallRationalDecoding

121116 , testCase "Big scientific exponent" bigScientificExponent

122117 , testCase "Big integer decoding" bigIntegerDecoding

123118 , testCase "Big natural decading" bigNaturalDecoding

@@ -258,18 +253,6 @@ formatErrorExample =

258253 lhs = "Error in $[0].foo.bar['a.b.c']['']['\\'\\\\'].end: error msg"

259254 in assertEqual "formatError example" lhs rhs

260255

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−

273256------------------------------------------------------------------------------

274257-- Comparison (.:?) and (.:!)

275258------------------------------------------------------------------------------

@@ -540,7 +523,6 @@ showOptions =

540523 ++ ", sumEncoding = TaggedObject {tagFieldName = \"tag\", contentsFieldName = \"contents\"}"

541524 ++ ", unwrapUnaryRecords = False"

542525 ++ ", tagSingleConstructors = False"

543− ++ ", rejectUnknownFields = False"

544526 ++ "}")

545527 (show defaultOptions)

546528

@@ -585,79 +567,6 @@ singleFieldCon :: Assertion

585567singleFieldCon =

586568 assertEqual "fromJSON" (Right (SingleFieldCon 0)) (eitherDecode "0")

587569

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−

661570testParser :: (Eq a, Show a)

662571 => String -> Parser a -> S.ByteString -> Either String a -> TestTree

663572testParser name json_ s expected =

@@ -698,25 +607,6 @@ ratioDenominator0 =

698607 (Left "Error in $: Ratio denominator was 0")

699608 (eitherDecode "{ \"numerator\": 1, \"denominator\": 0 }" :: Either String Rational)

700609

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−

720610bigScientificExponent :: Assertion

721611bigScientificExponent =

722612 assertEqual "Encoding an integral scientific with a large exponent should normalize it"

@@ -753,8 +643,3 @@ deriveToJSON defaultOptions ''Foo

753643deriveToJSON1 defaultOptions ''Foo

754644

755645deriveJSON 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/golden/generic.expected+3−11

@@ -6,11 +6,11 @@ Error in $: parsing Types.Nullary failed, expected one of the tags ["C1","C2","C

66Error in $: parsing Types.Nullary failed, expected String, but encountered Array

77SomeType (tagged)

88Error in $.contents: parsing Int failed, expected Number, but encountered Boolean

9−Error in $: parsing Types.SomeType(Unary) failed, key "contents" not found

10−Error in $: parsing Types.SomeType(Record) failed, key "testone" 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 present

1111Error in $.testone: parsing Double failed, unexpected Boolean

1212Error 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

1414Error in $: parsing Types.SomeType failed, expected Object, but encountered Array

1515SomeType (single-field)

1616Error 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

3131Error in $: parsing Types.SomeType failed, expected Array, but encountered Object

3232Error in $: not enough input. Expecting ',' or ']'

3333Error 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"]

4234EitherTextInt

4335Error in $: parsing Types.EitherTextInt(NoneNullary) failed, expected tag "nonenullary", but found tag "X"

4436Error 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

77stack --version

99case $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− ;;

1510 stack)

1611 stack --no-terminal --skip-ghc-check setup

1712 stack --no-terminal --skip-ghc-check test --only-snapshot

@@ -49,10 +44,4 @@ case $BUILD in

4944 cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;

5045 fi

5146 ;;

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− ;;

5847esac

travis/script.sh+2−4

@@ -19,11 +19,9 @@ case $BUILD in

1919 SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&

2020 (cd dist && cabal install --force-reinstalls "$SRC_TGZ")

2121 ;;

22− cabal2)

23− cabal v2-build --enable-tests --enable-benchmarks

24− cabal v2-test --enable-tests --enable-benchmarks

25− ;;

2622 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

2725 make lint

2826 ;;

2927esac