@@ -5,16 +5,20 @@
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 #-}
14+{-# LANGUAGE TypeSynonymInstances #-}
1515{-# LANGUAGE UndecidableInstances #-}
1616{-# LANGUAGE ViewPatterns #-}
1717
18+#if __GLASGOW_HASKELL__ >= 706
19+{-# LANGUAGE PolyKinds #-}
20+#endif
21+
1822#include "incoherent-compat.h"
1923#include "overlapping-compat.h"
2024
@@ -42,9 +46,6 @@ module Data.Aeson.Types.FromJSON
4246 , coerceFromJSONKeyFunction
4347 , mapFromJSONKeyFunction
4448
45− , GFromJSONKey()
46− , genericFromJSONKey
47−
4849 -- * List functions
4950 , listParser
5051
@@ -87,7 +88,7 @@ import Data.Aeson.Parser.Internal (eitherDecodeWith, jsonEOF)
8788import Data.Aeson.Types.Generic
8889import Data.Aeson.Types.Internal
8990import Data.Bits (unsafeShiftR)
90−import Data.Fixed (Fixed, HasResolution (resolution), Nano)
91+import Data.Fixed (Fixed, HasResolution)
9192import Data.Functor.Compose (Compose(..))
9293import Data.Functor.Identity (Identity(..))
9394import Data.Functor.Product (Product(..))
@@ -103,10 +104,8 @@ import Data.Scientific (Scientific, base10Exponent)
103104import Data.Tagged (Tagged(..))
104105import Data.Text (Text, pack, unpack)
105106import Data.Time (Day, DiffTime, LocalTime, NominalDiffTime, TimeOfDay, UTCTime, ZonedTime)
106−import Data.Time.Calendar.Compat (CalendarDiffDays (..), DayOfWeek (..))
107−import Data.Time.LocalTime.Compat (CalendarDiffTime (..))
108−import Data.Time.Clock.System.Compat (SystemTime (..))
109−import Data.Time.Format.Compat (parseTimeM, defaultTimeLocale)
107+import Data.Time.Format (parseTime)
108+import Data.Time.Locale.Compat (defaultTimeLocale)
110109import Data.Traversable as Tr (sequence)
111110import Data.Vector (Vector)
112111import Data.Version (Version, parseVersion)
@@ -118,9 +117,9 @@ import GHC.Generics
118117import Numeric.Natural (Natural)
119118import Text.ParserCombinators.ReadP (readP_to_S)
120119import Unsafe.Coerce (unsafeCoerce)
120+import qualified Data.Aeson.Compat as Compat
121121import qualified Data.Aeson.Parser.Time as Time
122122import qualified Data.Attoparsec.ByteString.Char8 as A (endOfInput, parseOnly, scientific)
123−import qualified Data.ByteString.Lazy as L
124123import qualified Data.DList as DList
125124import qualified Data.HashMap.Strict as H
126125import qualified Data.HashSet as HashSet
@@ -149,14 +148,22 @@ import qualified Data.Primitive.SmallArray as PM
149148import qualified Data.Primitive.Types as PM
150149
151150#if MIN_VERSION_primitive(0,6,4)
152−#if !MIN_VERSION_primitive(0,7,0)
153151import qualified Data.Primitive.UnliftedArray as PM
154−#endif
155152import qualified Data.Primitive.PrimArray as PM
156153#endif
157154
155+#ifndef HAS_COERCIBLE
156+#define HAS_COERCIBLE (__GLASGOW_HASKELL__ >= 707)
157+#endif
158158
159+#if HAS_COERCIBLE
159160import Data.Coerce (Coercible, coerce)
161+coerce' :: Coercible a b => a -> b
162+coerce' = coerce
163+#else
164+coerce' :: a -> b
165+coerce' = unsafeCoerce
166+#endif
160167
161168parseIndexedJSON :: (Value -> Parser a) -> Int -> Value -> Parser a
162169parseIndexedJSON p idx value = p value <?> Index idx
@@ -396,16 +403,6 @@ class FromJSON a where
396403-- > newtype SomeId = SomeId { getSomeId :: Text }
397404-- > deriving (Eq,Ord,Hashable,FromJSONKey)
398405--
399−-- If you have a sum of nullary constructors, you may use the generic
400−-- implementation:
401−--
402−-- @
403−-- data Color = Red | Green | Blue
404−-- deriving Generic
405−--
406−-- instance 'FromJSONKey' Color where
407−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
408−-- @
409406class FromJSONKey a where
410407 -- | Strategy for parsing the key of a map-like container.
411408 fromJSONKey :: FromJSONKeyFunction a
@@ -428,7 +425,11 @@ class FromJSONKey a where
428425-- At the moment this type is intentionally not exported. 'FromJSONKeyFunction'
429426-- can be inspected, but cannot be constructed.
430427data CoerceText a where
428+#if HAS_COERCIBLE
431429 CoerceText :: Coercible Text a => CoerceText a
430+#else
431+ CoerceText :: CoerceText a
432+#endif
432433
433434-- | This type is related to 'ToJSONKeyFunction'. If 'FromJSONKeyValue' is used in the
434435-- 'FromJSONKey' instance, then 'ToJSONKeyValue' should be used in the 'ToJSONKey'
@@ -448,7 +449,7 @@ data FromJSONKeyFunction a
448449
449450-- | Only law abiding up to interpretation
450451instance Functor FromJSONKeyFunction where
451− fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce)
452+ fmap h (FromJSONKeyCoerce CoerceText) = FromJSONKeyText (h . coerce')
452453 fmap h (FromJSONKeyText f) = FromJSONKeyText (h . f)
453454 fmap h (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap h . f)
454455 fmap h (FromJSONKeyValue f) = FromJSONKeyValue (fmap h . f)
@@ -462,7 +463,9 @@ instance Functor FromJSONKeyFunction where
462463--
463464-- On pre GHC 7.8 this is unconstrainted function.
464465fromJSONKeyCoerce ::
466+#if HAS_COERCIBLE
465467 Coercible Text a =>
468+#endif
466469 FromJSONKeyFunction a
467470fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
468471
@@ -470,52 +473,34 @@ fromJSONKeyCoerce = FromJSONKeyCoerce CoerceText
470473--
471474-- See note on 'fromJSONKeyCoerce'.
472475coerceFromJSONKeyFunction ::
476+#if HAS_COERCIBLE
473477 Coercible a b =>
478+#endif
474479 FromJSONKeyFunction a -> FromJSONKeyFunction b
480+#if HAS_COERCIBLE
475481coerceFromJSONKeyFunction = coerce
482+#else
483+coerceFromJSONKeyFunction (FromJSONKeyCoerce CoerceText) = FromJSONKeyCoerce CoerceText
484+coerceFromJSONKeyFunction (FromJSONKeyText f) = FromJSONKeyText (coerce' . f)
485+coerceFromJSONKeyFunction (FromJSONKeyTextParser f) = FromJSONKeyTextParser (fmap coerce' . f)
486+coerceFromJSONKeyFunction (FromJSONKeyValue f) = FromJSONKeyValue (fmap coerce' . f)
487+#endif
476488
477489{-# RULES
478490 "FromJSONKeyCoerce: fmap id" forall (x :: FromJSONKeyFunction a).
479491 fmap id x = x
480492 #-}
493+#if HAS_COERCIBLE
481494{-# RULES
482495 "FromJSONKeyCoerce: fmap coerce" forall x .
483496 fmap coerce x = coerceFromJSONKeyFunction x
484497 #-}
498+#endif
485499
486500-- | Same as 'fmap'. Provided for the consistency with 'ToJSONKeyFunction'.
487501mapFromJSONKeyFunction :: (a -> b) -> FromJSONKeyFunction a -> FromJSONKeyFunction b
488502mapFromJSONKeyFunction = fmap
489503
490−-- | 'fromJSONKey' for 'Generic' types.
491−-- These types must be sums of nullary constructors, whose names will be used
492−-- as keys for JSON objects.
493−--
494−-- See also 'genericToJSONKey'.
495−--
496−-- === __Example__
497−--
498−-- @
499−-- data Color = Red | Green | Blue
500−-- deriving 'Generic'
501−--
502−-- instance 'FromJSONKey' Color where
503−-- 'fromJSONKey' = 'genericFromJSONKey' 'defaultJSONKeyOptions'
504−-- @
505−genericFromJSONKey :: forall a. (Generic a, GFromJSONKey (Rep a))
506− => JSONKeyOptions
507− -> FromJSONKeyFunction a
508−genericFromJSONKey opts = FromJSONKeyTextParser $ \t ->
509− case parseSumFromString (keyModifier opts) t of
510− Nothing -> fail $
511− "invalid key " ++ show t ++ ", expected one of " ++ show cnames
512− Just k -> pure (to k)
513− where
514− cnames = unTagged2 (constructorTags (keyModifier opts) :: Tagged2 (Rep a) [String])
515−
516−class (ConstructorNames f, SumFromString f) => GFromJSONKey f where
517−instance (ConstructorNames f, SumFromString f) => GFromJSONKey f where
518−
519504-------------------------------------------------------------------------------
520505-- Functions needed for documentation
521506-------------------------------------------------------------------------------
@@ -768,13 +753,13 @@ withBoundedScientific' f v = withBoundedScientific_ id f v
768753-- | A variant of 'withBoundedScientific_' parameterized by a function to apply
769754-- to the 'Parser' in case of failure.
770755withBoundedScientific_ :: (Parser a -> Parser a) -> (Scientific -> Parser a) -> Value -> Parser a
771−withBoundedScientific_ whenFail f (Number scientific) =
772− if exp10 > 1024
756+withBoundedScientific_ whenFail f v@(Number scientific) =
757+ if exponent > 1024
773758 then whenFail (fail msg)
774759 else f scientific
775760 where
776− exp10 = base10Exponent scientific
777− msg = "found a number with exponent " ++ show exp10 ++ ", but it must not be greater than 1024"
761+ exponent = base10Exponent scientific
762+ msg = "found a number with exponent " ++ show exponent ++ ", but it must not be greater than 1024"
778763withBoundedScientific_ whenFail _ v =
779764 whenFail (typeMismatch "Number" v)
780765{-# INLINE withBoundedScientific_ #-}
@@ -794,7 +779,7 @@ withBool name _ v = prependContext name (typeMismatch "Boolean" v)
794779-- | Decode a nested JSON-encoded string.
795780withEmbeddedJSON :: String -> (Value -> Parser a) -> Value -> Parser a
796781withEmbeddedJSON _ innerParser (String txt) =
797− either fail innerParser $ eitherDecode (L.fromStrict $ T.encodeUtf8 txt)
782+ either fail innerParser $ eitherDecode (Compat.fromStrict $ T.encodeUtf8 txt)
798783 where
799784 eitherDecode = eitherFormatError . eitherDecodeWith jsonEOF ifromJSON
800785 eitherFormatError = either (Left . uncurry formatError) Right
@@ -863,7 +848,7 @@ parseFieldMaybe' = (.:!)
863848-- E.g. @'explicitParseField' 'parseJSON1' :: ('FromJSON1' f, 'FromJSON' a) -> 'Object' -> 'Text' -> 'Parser' (f a)@
864849explicitParseField :: (Value -> Parser a) -> Object -> Text -> Parser a
865850explicitParseField p obj key = case H.lookup key obj of
866− Nothing -> fail $ "key " ++ show key ++ " not found"
851+ Nothing -> fail $ "key " ++ show key ++ " not present"
867852 Just v -> p v <?> Key key
868853{-# INLINE explicitParseField #-}
869854
@@ -922,16 +907,6 @@ type ConName = String
922907contextType :: TypeName -> Parser a -> Parser a
923908contextType = prependContext
924909
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−
935910-- | Add the name of the constructor being parsed to a parser's error messages.
936911contextCons :: ConName -> TypeName -> Parser a -> Parser a
937912contextCons cname tname = prependContext (showCons cname tname)
@@ -1042,46 +1017,41 @@ parseAllNullarySum :: (SumFromString f, ConstructorNames f)
10421017parseAllNullarySum tname opts =
10431018 withText tname $ \tag ->
10441019 maybe (badTag tag) return $
1045− parseSumFromString modifier tag
1020+ parseSumFromString opts tag
10461021 where
1047− badTag tag = failWithCTags tname modifier $ \cnames ->
1022+ badTag tag = failWithCTags tname opts $ \cnames ->
10481023 "expected one of the tags " ++ show cnames ++
10491024 ", but found tag " ++ show tag
1050− modifier = constructorTagModifier opts
10511025
10521026-- | Fail with an informative error message about a mismatched tag.
10531027-- The error message is parameterized by the list of expected tags,
10541028-- to be inferred from the result type of the parser.
10551029failWithCTags
1056− :: forall f a t. ConstructorNames f
1057− => TypeName -> (String -> t) -> ([t] -> String) -> Parser (f a)
1058−failWithCTags tname modifier f =
1030+ :: forall f a. ConstructorNames f
1031+ => TypeName -> Options -> ([String] -> String) -> Parser (f a)
1032+failWithCTags tname opts f =
10591033 contextType tname . fail $ f cnames
10601034 where
1061− cnames = unTagged2 (constructorTags modifier :: Tagged2 f [t])
1035+ cnames = unTagged2 (constructorTags opts :: Tagged2 f [String])
10621036
10631037class SumFromString f where
1064− parseSumFromString :: (String -> String) -> Text -> Maybe (f a)
1038+ parseSumFromString :: Options -> Text -> Maybe (f a)
10651039
10661040instance (SumFromString a, SumFromString b) => SumFromString (a :+: b) where
10671041 parseSumFromString opts key = (L1 <$> parseSumFromString opts key) <|>
10681042 (R1 <$> parseSumFromString opts key)
10691043
10701044instance (Constructor c) => SumFromString (C1 c U1) where
1071− parseSumFromString modifier key
1072− | key == name = Just $ M1 U1
1073− | otherwise = Nothing
1074− where
1075− name = pack $ modifier $ conName (undefined :: M1 _i c _f _p)
1076−
1077−-- For genericFromJSONKey
1078−instance SumFromString a => SumFromString (D1 d a) where
1079− parseSumFromString modifier key = M1 <$> parseSumFromString modifier key
1045+ parseSumFromString opts key | key == name = Just $ M1 U1
1046+ | otherwise = Nothing
1047+ where
1048+ name = pack $ constructorTagModifier opts $
1049+ conName (undefined :: M1 _i c _f _p)
10801050
10811051-- | List of all constructor tags.
1082−constructorTags :: ConstructorNames a => (String -> t) -> Tagged2 a [t]
1083−constructorTags modifier =
1084− fmap DList.toList (constructorNames' modifier)
1052+constructorTags :: ConstructorNames a => Options -> Tagged2 a [String]
1053+constructorTags opts =
1054+ fmap DList.toList (constructorNames' (constructorTagModifier opts))
10851055
10861056-- | List of all constructor names of an ADT, after a given conversion
10871057-- function. (Better inlining.)
@@ -1102,16 +1072,9 @@ instance Constructor c => ConstructorNames (C1 c a) where
11021072 where
11031073 cname = conName (undefined :: M1 _i c _f _p)
11041074
1105−-- For genericFromJSONKey
1106−instance ConstructorNames a => ConstructorNames (D1 d a) where
1107− constructorNames' = retag . constructorNames'
1108− where
1109− retag :: Tagged2 a u -> Tagged2 (D1 d a) u
1110− retag (Tagged2 x) = Tagged2 x
1111−
11121075--------------------------------------------------------------------------------
1113−parseNonAllNullarySum :: forall f c arity.
1114− ( FromPair arity f
1076+
1077+parseNonAllNullarySum :: ( FromPair arity f
11151078 , FromTaggedObject arity f
11161079 , FromUntaggedValue arity f
11171080 , ConstructorNames f
@@ -1121,7 +1084,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
11211084 case sumEncoding opts of
11221085 TaggedObject{..} ->
11231086 withObject tname $ \obj -> do
1124− tag <- contextType tname . contextTag tagKey cnames_ $ obj .: tagKey
1087+ tag <- contextType tname $ obj .: tagKey
11251088 fromMaybe (badTag tag <?> Key tagKey) $
11261089 parseFromTaggedObject (tag :* contentsFieldName :* p) obj
11271090 where
@@ -1129,7 +1092,6 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
11291092 badTag tag = failWith_ $ \cnames ->
11301093 "expected tag field to be one of " ++ show cnames ++
11311094 ", but found tag " ++ show tag
1132− cnames_ = unTagged2 (constructorTags (constructorTagModifier opts) :: Tagged2 f [String])
11331095
11341096 ObjectWithSingleField ->
11351097 withObject tname $ \obj -> case H.toList obj of
@@ -1161,7 +1123,7 @@ parseNonAllNullarySum p@(tname :* opts :* _) =
11611123
11621124 UntaggedValue -> parseUntaggedValue p
11631125 where
1164− failWith_ = failWithCTags tname (constructorTagModifier opts)
1126+ failWith_ = failWithCTags tname opts
11651127
11661128--------------------------------------------------------------------------------
11671129
@@ -1201,9 +1163,9 @@ class FromTaggedObject' arity f isRecord where
12011163 :: String :* ConName :* TypeName :* Options :* FromArgs arity a
12021164 -> Object -> Tagged isRecord (Parser (f a))
12031165
1204−instance (RecordFromJSON arity f, FieldNames f) => FromTaggedObject' arity f True where
1166+instance (RecordFromJSON arity f) => FromTaggedObject' arity f True where
12051167 -- Records are unpacked in the tagged object
1206− parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON (True :* p)
1168+ parseFromTaggedObject' (_ :* p) = Tagged . recordParseJSON p
12071169
12081170instance (ConsFromJSON arity f) => FromTaggedObject' arity f False where
12091171 -- Nonnullary nonrecords are encoded in the contents field
@@ -1244,11 +1206,11 @@ instance OVERLAPPING_
12441206 ) => ConsFromJSON' arity (S1 s a) True where
12451207 consParseJSON' p@(cname :* tname :* opts :* fargs)
12461208 | unwrapUnaryRecords opts = Tagged . fmap M1 . gParseJSON opts fargs
1247− | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1209+ | otherwise = Tagged . withObject (showCons cname tname) (recordParseJSON p)
12481210
12491211instance RecordFromJSON arity f => ConsFromJSON' arity f True where
12501212 consParseJSON' p@(cname :* tname :* _) =
1251− Tagged . withObject (showCons cname tname) (recordParseJSON (False :* p))
1213+ Tagged . withObject (showCons cname tname) (recordParseJSON p)
12521214
12531215instance OVERLAPPING_
12541216 ConsFromJSON' arity U1 False where
@@ -1274,55 +1236,21 @@ instance (ProductFromJSON arity f, ProductSize f
12741236
12751237--------------------------------------------------------------------------------
12761238
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−
12881239class RecordFromJSON arity f where
12891240 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'
13131241 :: ConName :* TypeName :* Options :* FromArgs arity a
13141242 -> Object -> Parser (f a)
13151243
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
1244+instance ( RecordFromJSON arity a
1245+ , RecordFromJSON arity b
1246+ ) => RecordFromJSON arity (a :*: b) where
1247+ recordParseJSON p obj =
1248+ (:*:) <$> recordParseJSON p obj
1249+ <*> recordParseJSON p obj
13221250
13231251instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
1324− RecordFromJSON' arity (S1 s a) where
1325− recordParseJSON' (cname :* tname :* opts :* fargs) obj = do
1252+ RecordFromJSON arity (S1 s a) where
1253+ recordParseJSON (cname :* tname :* opts :* fargs) obj = do
13261254 fv <- contextCons cname tname (obj .: label)
13271255 M1 <$> gParseJSON opts fargs fv <?> Key label
13281256 where
@@ -1330,16 +1258,16 @@ instance OVERLAPPABLE_ (Selector s, GFromJSON arity a) =>
13301258 sname = selName (undefined :: M1 _i s _f _p)
13311259
13321260instance INCOHERENT_ (Selector s, FromJSON a) =>
1333− RecordFromJSON' arity (S1 s (K1 i (Maybe a))) where
1334− recordParseJSON' (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
1261+ RecordFromJSON arity (S1 s (K1 i (Maybe a))) where
1262+ recordParseJSON (_ :* _ :* opts :* _) obj = M1 . K1 <$> obj .:? pack label
13351263 where
13361264 label = fieldLabelModifier opts sname
13371265 sname = selName (undefined :: M1 _i s _f _p)
13381266
13391267-- Parse an Option like a Maybe.
13401268instance INCOHERENT_ (Selector s, FromJSON a) =>
1341− RecordFromJSON' arity (S1 s (K1 i (Semigroup.Option a))) where
1342− recordParseJSON' p obj = wrap <$> recordParseJSON' p obj
1269+ RecordFromJSON arity (S1 s (K1 i (Semigroup.Option a))) where
1270+ recordParseJSON p obj = wrap <$> recordParseJSON p obj
13431271 where
13441272 wrap :: S1 s (K1 i (Maybe a)) p -> S1 s (K1 i (Semigroup.Option a)) p
13451273 wrap (M1 (K1 a)) = M1 (K1 (Semigroup.Option a))
@@ -1576,22 +1504,12 @@ instance FromJSONKey Float where
15761504 _ -> Scientific.toRealFloat <$> parseScientificText t
15771505
15781506instance (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
1507+ parseJSON = withObject "Rational" $ \obj -> do
1508+ numerator <- obj .: "numerator"
1509+ denominator <- obj .: "denominator"
1510+ if denominator == 0
1511+ then fail "Ratio denominator was 0"
1512+ else pure $ numerator % denominator
15951513 {-# INLINE parseJSON #-}
15961514
15971515-- | This instance includes a bounds check to prevent maliciously
@@ -1742,7 +1660,7 @@ instance FromJSON1 NonEmpty where
17421660 liftParseJSON p _ = withArray "NonEmpty" $
17431661 (>>= ne) . Tr.sequence . zipWith (parseIndexedJSON p) [0..] . V.toList
17441662 where
1745− ne [] = fail "parsing NonEmpty failed, unexpected empty list"
1663+ ne [] = fail "parsing NonEmpty failed, unpexpected empty list"
17461664 ne (x:xs) = pure (x :| xs)
17471665 {-# INLINE liftParseJSON #-}
17481666
@@ -1997,7 +1915,7 @@ instance FromJSON DotNetTime where
19971915 parseJSON = withText "DotNetTime" $ \t ->
19981916 let (s,m) = T.splitAt (T.length t - 5) t
19991917 t' = T.concat [s,".",m]
2000− in case parseTimeM True defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
1918+ in case parseTime defaultTimeLocale "/Date(%s%Q)/" (unpack t') of
20011919 Just d -> pure (DotNetTime d)
20021920 _ -> fail "could not parse .NET time"
20031921 {-# INLINE parseJSON #-}
@@ -2006,6 +1924,7 @@ instance FromJSON DotNetTime where
20061924-- primitive
20071925-------------------------------------------------------------------------------
20081926
1927+#if MIN_VERSION_base(4,7,0)
20091928instance FromJSON a => FromJSON (PM.Array a) where
20101929 -- note: we could do better than this if vector exposed the data
20111930 -- constructor in Data.Vector.
@@ -2018,7 +1937,6 @@ instance FromJSON a => FromJSON (PM.SmallArray a) where
20181937instance (PM.Prim a,FromJSON a) => FromJSON (PM.PrimArray a) where
20191938 parseJSON = fmap Exts.fromList . parseJSON
20201939
2021−#if !MIN_VERSION_primitive(0,7,0)
20221940instance (PM.PrimUnlifted a,FromJSON a) => FromJSON (PM.UnliftedArray a) where
20231941 parseJSON = fmap Exts.fromList . parseJSON
20241942#endif
@@ -2091,40 +2009,6 @@ instance FromJSON DiffTime where
20912009 parseJSON = withBoundedScientific "DiffTime" $ pure . realToFrac
20922010 {-# INLINE parseJSON #-}
20932011
2094−instance FromJSON SystemTime where
2095− parseJSON v = prependContext "SystemTime" $ do
2096− n <- parseJSON v
2097− let n' = floor (n * fromInteger (resolution n) :: Nano)
2098− let (secs, nano) = n' `divMod` resolution n
2099− return (MkSystemTime (fromInteger secs) (fromInteger nano))
2100−
2101−instance FromJSON CalendarDiffTime where
2102− parseJSON = withObject "CalendarDiffTime" $ \obj -> CalendarDiffTime
2103− <$> obj .: "months"
2104− <*> obj .: "time"
2105−
2106−instance FromJSON CalendarDiffDays where
2107− parseJSON = withObject "CalendarDiffDays" $ \obj -> CalendarDiffDays
2108− <$> obj .: "months"
2109− <*> obj .: "days"
2110−
2111−instance FromJSON DayOfWeek where
2112− parseJSON = withText "DaysOfWeek" parseDayOfWeek
2113−
2114−parseDayOfWeek :: T.Text -> Parser DayOfWeek
2115−parseDayOfWeek t = case T.toLower t of
2116− "monday" -> return Monday
2117− "tuesday" -> return Tuesday
2118− "wednesday" -> return Wednesday
2119− "thursday" -> return Thursday
2120− "friday" -> return Friday
2121− "saturday" -> return Saturday
2122− "sunday" -> return Sunday
2123− _ -> fail "Invalid week day"
2124−
2125−instance FromJSONKey DayOfWeek where
2126− fromJSONKey = FromJSONKeyTextParser parseDayOfWeek
2127−
21282012-------------------------------------------------------------------------------
21292013-- base Monoid/Semigroup
21302014-------------------------------------------------------------------------------