@@ -7,14 +7,16 @@
77{-# LANGUAGE MultiParamTypeClasses #-}
88{-# LANGUAGE NoImplicitPrelude #-}
99{-# LANGUAGE OverloadedStrings #-}
10−{-# LANGUAGE PolyKinds #-}
1110{-# LANGUAGE RecordWildCards #-}
1211{-# LANGUAGE ScopedTypeVariables #-}
1312{-# LANGUAGE TypeOperators #-}
14−{-# LANGUAGE TupleSections #-}
1513{-# LANGUAGE UndecidableInstances #-}
1614{-# LANGUAGE ViewPatterns #-}
1715
16+#if __GLASGOW_HASKELL__ >= 706
17+{-# LANGUAGE PolyKinds #-}
18+#endif
19+
1820#include "incoherent-compat.h"
1921#include "overlapping-compat.h"
2022
@@ -118,9 +120,9 @@ import GHC.Generics
118120import Numeric.Natural (Natural)
119121import Text.ParserCombinators.ReadP (readP_to_S)
120122import Unsafe.Coerce (unsafeCoerce)
123+import qualified Data.Aeson.Compat as Compat
121124import qualified Data.Aeson.Parser.Time as Time
122125import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124126import qualified Data.DList as DList
125127import qualified Data.HashMap.Strict as H
126128import qualified Data.HashSet as HashSet
@@ -155,8 +157,18 @@ import qualified Data.Primitive.UnliftedArray as PM
155157import qualified Data.Primitive.PrimArray as PM
156158#endif
157159
160+#ifndef HAS_COERCIBLE
161+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
162+#endif
158163
164+#if HAS_COERCIBLE
159165import Data.Coerce (Coercible, coerce)
166+coerce' :: Coercible a b => a -> b
167+coerce' = coerce
168+#else
169+coerce' :: a -> b
170+coerce' = unsafeCoerce
171+#endif
160172
161173parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162174parseIndexedJSON p idx value = p value <?> Index idx
@@ -428,7 +440,11 @@ class FromJSONKey a where
428440-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429441-- can be inspected, but cannot be constructed.
430442data CoerceText a where
443+#if HAS_COERCIBLE
431444 CoerceText :: Coercible Text a => CoerceText a
445+#else
446+ CoerceText :: CoerceText a
447+#endif
432448
433449-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434450-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +464,7 @@ data FromJSONKeyFunction a
448464
449465-- | Only law abiding up to interpretation
450466instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
467+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452468 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453469 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454470 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +478,9 @@ instance Functor FromJSONKeyFunction where
462478--
463479-- On pre GHC 7.8 this is unconstrainted function.
464480fromJSONKeyCoerce ::
481+#if HAS_COERCIBLE
465482 Coercible Text a =>
483+#endif
466484 FromJSONKeyFunction a
467485fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
468486
@@ -470,18 +488,29 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
470488--
471489-- See note on 'fromJSONKeyCoerce'.
472490coerceFromJSONKeyFunction ::
491+#if HAS_COERCIBLE
473492 Coercible a b =>
493+#endif
474494 FromJSONKeyFunction a -> FromJSONKeyFunction b
495+#if HAS_COERCIBLE
475496coerceFromJSONKeyFunction = coerce
497+#else
498+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
499+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
500+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
501+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
502+#endif
476503
477504{-# RULES
478505 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479506 fmap id x = x
480507 #-}
508+#if HAS_COERCIBLE
481509{-# RULES
482510 "FromJSONKeyCoerce: fmap coerce" forall x .
483511 fmap coerce x = coerceFromJSONKeyFunction x
484512 #-}
513+#endif
485514
486515-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487516mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
@@ -676,6 +705,7 @@ instance (FromJSON a) => FromJSON [a] where
676705prependContext :: String -> Parser a -> Parser a
677706prependContext name = prependFailure ("parsing " ++ name ++ " failed, ")
678707
708+
679709-- | @'withObject' name f value@ applies @f@ to the 'Object' when @value@
680710-- is an 'Data.Aeson.Object' and fails otherwise.
681711--
@@ -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
@@ -928,9 +958,9 @@ contextType = prependContext
928958-- | "contents", where "tag" i-- |s associated to one of ["Foo", "Bar"],
929959-- | The parser returned error was: could not find key "tag"
930960contextTag :: Text -> [String] -> Parser a -> Parser a
931−contextTag tagKey cnames = prependFailure
961+contextTag tagKey cnames = modifyFailure (const
932962 ("expected Object with key \"" ++ unpack tagKey ++ "\"" ++
933− " containing one of " ++ show cnames ++ ", ")
963+ " associated to one of " ++ show cnames ++ "."))
934964
935965-- | Add the name of the constructor being parsed to a parser's error messages.
936966contextCons :: ConName -> TypeName -> Parser a -> Parser a
@@ -1123,7 +1153,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
11231153 withObject tname $ \obj -> do
11241154 tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
11251155 fromMaybe (badTag tag <?> Key tagKey) $
1126− parseFromTaggedObject (tag :* contentsFieldName :* p) obj
1156+ parseFromTaggedObject (tag :* contentsFieldName :* p) obj
11271157 where
11281158 tagKey = pack tagFieldName
11291159 badTag tag = failWith_ $ \cnames ->
@@ -1201,9 +1231,9 @@ class FromTaggedObject' arity f isRecord where
12011231 :: String :* ConName :* TypeName :* Options :* FromArgs arity a
12021232 -> Object -> Tagged isRecord (Parser (f a))
12031233
1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
1234+instance (RecordFromJSON arity f) => FromTaggedObject' arity f True where
12051235 -- Records are unpacked in the tagged object
1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
1236+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON p
12071237
12081238instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
12091239 -- Nonnullary nonrecords are encoded in the contents field
@@ -1244,11 +1274,11 @@ instance OVERLAPPING_
12441274 ) => ConsFromJSON' arity (S1 s a) True where
12451275 consParseJSON' p@(cname :* tname :* opts :* fargs)
12461276 | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1277+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON p)
12481278
12491279instance RecordFromJSON arity f => ConsFromJSON' arity f True where
12501280 consParseJSON' p@(cname :* tname :* _) =
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1281+ Tagged . withObject (showCons cname tname) (recordParseJSON p)
12521282
12531283instance OVERLAPPING_
12541284 ConsFromJSON' arity U1 False where
@@ -1274,55 +1304,21 @@ instance (ProductFromJSON arity f, ProductSize f
12741304
12751305--------------------------------------------------------------------------------
12761306
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−
12881307class RecordFromJSON arity f where
12891308 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'
13131309 :: ConName :* TypeName :* Options :* FromArgs arity a
13141310 -> Object -> Parser (f a)
13151311
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
1312+instance ( RecordFromJSON arity a
1313+ , RecordFromJSON arity b
1314+ ) => RecordFromJSON arity (a :*: b) where
1315+ recordParseJSON p obj =
1316+ (:*:) <$> recordParseJSON p obj
1317+ <*> recordParseJSON p obj
13221318
13231319instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324− RecordFromJSON' arity (S1 s a) where
1325− recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1320+ RecordFromJSON arity (S1 s a) where
1321+ recordParseJSON (cname :* tname :* opts :* fargs) obj = do
13261322 fv <- contextCons cname tname (obj .: label)
13271323 M1 <$> gParseJSON opts fargs fv <?> Key label
13281324 where
@@ -1330,16 +1326,16 @@ instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
13301326 sname = selName (undefined :: M1 _i s _f _p)
13311327
13321328instance INCOHERENT_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1329+ RecordFromJSON arity (S1 s (K1 i (Maybe a))) where
1330+ recordParseJSON (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
13351331 where
13361332 label = fieldLabelModifier opts sname
13371333 sname = selName (undefined :: M1 _i s _f _p)
13381334
13391335-- Parse an Option like a Maybe.
13401336instance INCOHERENT_ (Selector s, FromJSON a) =>
1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1337+ RecordFromJSON arity (S1 s (K1 i (Semigroup.Option a))) where
1338+ recordParseJSON p obj = wrap <$> recordParseJSON p obj
13431339 where
13441340 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
13451341 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
@@ -1576,22 +1572,12 @@ instance FromJSONKey Float where
15761572 _ -> Scientific.toRealFloat <$> parseScientificText t
15771573
15781574instance (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
1575+ parseJSON = withObject "Rational" $ \obj -> do
1576+ numerator <- obj .: "numerator"
1577+ denominator <- obj .: "denominator"
1578+ if denominator == 0
1579+ then fail "Ratio denominator was 0"
1580+ else pure $ numerator % denominator
15951581 {-# INLINE parseJSON #-}
15961582
15971583-- | This instance includes a bounds check to prevent maliciously
@@ -2006,6 +1992,7 @@ instance FromJSON DotNetTime where
20061992-- primitive
20071993-------------------------------------------------------------------------------
20081994
1995+#if MIN_VERSION_base(4,7,0)
20091996instance FromJSON a => FromJSON (PM.Array a) where
20101997 -- note: we could do better than this if vector exposed the data
20111998 -- constructor in Data.Vector.
@@ -2023,6 +2010,7 @@ instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
20232010 parseJSON = fmap Exts.fromList . parseJSON
20242011#endif
20252012#endif
2013+#endif
20262014
20272015-------------------------------------------------------------------------------
20282016-- time