51ef58f · typeable/aeson

git.iko.soy/typeable/aeson

on master help sign in

Add listParser and rename list to listEncoding

51ef58fAndrew Martin10 years ago

Data/Aeson/Encode/Functions.hs+3

compare with master

unifiedsplit

@@ -25,6 +25,9 @@ import Data.Foldable (Foldable, foldMap)

25import Data.Monoid (mempty)

26#endif

28+list :: (a -> Encoding) -> [a] -> Encoding

29+list = listEncoding

30+

28builder :: ToJSON a => a -> Builder

31builder :: ToJSON a => a -> Builder

29builder = fromEncoding . toEncoding

32builder = fromEncoding . toEncoding

30{-# INLINE builder #-}

33{-# INLINE builder #-}

Data/Aeson/Types/Class.hs+16−10

@@ -45,8 +45,9 @@ module Data.Aeson.Types.Class

45 -- * Functions needed for documentation

46 , typeMismatch

47 -- * Encoding functions

48− , list

48+ , listEncoding

49 , listValue

50+ , listParser

50 ) where

51 ) where

52import Data.Aeson.Types.Internal

53import Data.Aeson.Types.Internal

@@ -408,9 +409,7 @@ typeMismatch expected actual =

408class FromJSON1 f where

409class FromJSON1 f where

409 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)

410 liftParseJSON :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser (f a)

410 liftParseJSONList :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser [f a]

411 liftParseJSONList :: (Value -> Parser a) -> (Value -> Parser [a]) -> Value -> Parser [f a]

411− liftParseJSONList f g v = case v of

412+ liftParseJSONList f g v = listParser (liftParseJSON f g) v

412− Array vals -> fmap V.toList (V.mapM (liftParseJSON f g) vals)

413− _ -> typeMismatch "[a]" v

414

413

415-- | Lift the standard 'parseJSON' function through the type constructor.

414-- | Lift the standard 'parseJSON' function through the type constructor.

416parseJSON1 :: (FromJSON1 f, FromJSON a) => Value -> Parser (f a)

415parseJSON1 :: (FromJSON1 f, FromJSON a) => Value -> Parser (f a)

@@ -426,7 +425,7 @@ class ToJSON1 f where

426 -- | Unfortunately there cannot be a default implementation of 'liftToEncoding'.

425 -- | Unfortunately there cannot be a default implementation of 'liftToEncoding'.

427 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding

426 liftToEncoding :: (a -> Encoding) -> ([a] -> Encoding) -> f a -> Encoding

428 liftToEncodingList :: (a -> Encoding) -> ([a] -> Encoding) -> [f a] -> Encoding

427 liftToEncodingList :: (a -> Encoding) -> ([a] -> Encoding) -> [f a] -> Encoding

429− liftToEncodingList f g = list (liftToEncoding f g)

428+ liftToEncodingList f g = listEncoding (liftToEncoding f g)

430

429

431-- | Lift the standard 'toJSON' function through the type constructor.

430-- | Lift the standard 'toJSON' function through the type constructor.

432toJSON1 :: (ToJSON1 f, ToJSON a) => f a -> Value

431toJSON1 :: (ToJSON1 f, ToJSON a) => f a -> Value

@@ -470,7 +469,7 @@ class ToJSON2 f where

470

469

471 liftToEncoding2 :: (a -> Encoding) -> ([a] -> Encoding) -> (b -> Encoding) -> ([b] -> Encoding) -> f a b -> Encoding

470 liftToEncoding2 :: (a -> Encoding) -> ([a] -> Encoding) -> (b -> Encoding) -> ([b] -> Encoding) -> f a b -> Encoding

472 liftToEncodingList2 :: (a -> Encoding) -> ([a] -> Encoding) -> (b -> Encoding) -> ([b] -> Encoding) -> [f a b] -> Encoding

471 liftToEncodingList2 :: (a -> Encoding) -> ([a] -> Encoding) -> (b -> Encoding) -> ([b] -> Encoding) -> [f a b] -> Encoding

473− liftToEncodingList2 fa ga fb gb = list (liftToEncoding2 fa ga fb gb)

472+ liftToEncodingList2 fa ga fb gb = listEncoding (liftToEncoding2 fa ga fb gb)

474

473

475-- | Lift the standard 'toJSON' function through the type constructor.

474-- | Lift the standard 'toJSON' function through the type constructor.

476toJSON2 :: (ToJSON2 f, ToJSON a, ToJSON b) => f a b -> Value

475toJSON2 :: (ToJSON2 f, ToJSON a, ToJSON b) => f a b -> Value

@@ -482,12 +481,19 @@ toEncoding2 :: (ToJSON2 f, ToJSON a, ToJSON b) => f a b -> Encoding

482toEncoding2 = liftToEncoding2 toEncoding toEncodingList toEncoding toEncodingList

481toEncoding2 = liftToEncoding2 toEncoding toEncodingList toEncoding toEncodingList

483{-# INLINE toEncoding2 #-}

482{-# INLINE toEncoding2 #-}

484

483

485−list :: (a -> Encoding) -> [a] -> Encoding

484+listEncoding :: (a -> Encoding) -> [a] -> Encoding

486−list _ [] = emptyArray_

485+listEncoding _ [] = emptyArray_

487−list to (x:xs) = Encoding $

486+listEncoding to (x:xs) = Encoding $

488 B.char7 '[' <> fromEncoding (to x) <> commas xs <> B.char7 ']'

487 B.char7 '[' <> fromEncoding (to x) <> commas xs <> B.char7 ']'

489 where commas = foldr (\v vs -> B.char7 ',' <> fromEncoding (to v) <> vs) mempty

488 where commas = foldr (\v vs -> B.char7 ',' <> fromEncoding (to v) <> vs) mempty

490−{-# INLINE list #-}

489+{-# INLINE listEncoding #-}

491

490

492listValue :: (a -> Value) -> [a] -> Value

491listValue :: (a -> Value) -> [a] -> Value

493listValue f = Array . V.fromList . map f

492listValue f = Array . V.fromList . map f

493+{-# INLINE listValue #-}

494+

495+listParser :: (Value -> Parser a) -> Value -> Parser [a]

496+listParser f (Array xs) = fmap V.toList (V.mapM f xs)

497+listParser _ v = typeMismatch "[a]" v

498+

499+