topaz 0.7.0 → 0.8.0

raw patch · 2 files changed

+2/−43 lines, 2 filesdep −aeson

Dependencies removed: aeson

Files

• src/Topaz/Types.hs +0/−40
• topaz.cabal +2/−3

@@ -29,7 +29,6 @@  import Control.Applicative (liftA2) import Data.Exists-import Data.Foldable (foldrM) import Data.Hashable (Hashable(..)) import Data.Kind (Type) import Data.Monoid.Lifted (Semigroup1(..), Monoid1(..), append1)@@ -39,10 +38,7 @@ import Foreign.Ptr (castPtr,plusPtr) import Foreign.Storable (Storable(..)) -import qualified Data.Aeson as AE-import qualified Data.Aeson.Types as AET import qualified Data.Semigroup as SG-import qualified Data.Vector as V  data Nat = Succ Nat | Zero @@ -204,33 +200,6 @@ instance SemigroupForall f => SemigroupForall (Rec f) where   appendForall = recZipWith appendForall -instance ToJSONForall f => AE.ToJSON (Rec f as) where-  toJSON = toJSONForall--instance ToJSONForall f => ToJSONForall (Rec f) where-  toJSONForall = AE.toJSON . go-    where-    go :: forall g xs. ToJSONForall g => Rec g xs -> [AE.Value]-    go RecNil = []-    go (RecCons x xs) = toJSONForall x : go xs--instance (FromJSONForeach f, Reify as) => AE.FromJSON (Rec f as) where-  parseJSON = parseJSONForeach reify--instance FromJSONForeach f => FromJSONForeach (Rec f) where-  parseJSONForeach s0 = AE.withArray "Rec" $ \vs -> do-    let go :: SingList as -> Int -> AET.Parser (Rec f as)-        go SingListNil !ix = if V.length vs == ix-          then return RecNil-          else fail "too many elements in array"-        go (SingListCons s ss) !ix = if ix < V.length vs-          then do-            r <- parseJSONForeach s (vs V.! ix)-            rs <- go ss (ix + 1)-            return (RecCons r rs)-          else fail "not enough elements in array"-    go s0 0- instance StorableForeach f => StorableForeach (Rec f) where   sizeOfForeach _ SingListNil = 0   sizeOfForeach _ (SingListCons s ss) =@@ -259,15 +228,6 @@   getForeach SingListNil = return RecNil   getForeach (SingListCons s ss) =     liftA2 RecCons (getForeach s) (getForeach ss)--instance FromJSONExists f => FromJSONExists (Rec f) where-  parseJSONExists = AE.withArray "Rec" $ \vs -> -    foldrM go (Exists RecNil) vs-    where-    go :: forall g. FromJSONExists g => AE.Value -> Exists (Rec g) -> AET.Parser (Exists (Rec g))-    go v (Exists rs) = do-      Exists r <- parseJSONExists v :: AET.Parser (Exists g)-      return (Exists (RecCons r rs))  recZipWith :: (forall x. f x -> g x -> h x) -> Rec f rs -> Rec g rs -> Rec h rs recZipWith _ RecNil RecNil = RecNil

@@ -1,6 +1,6 @@ cabal-version: 2.4 name: topaz-version: 0.7.0+version: 0.8.0 synopsis: Extensible records library description: Provides extensible records types built on top of the quantification library homepage: https://github.com/andrewthad/quantification#readme@@ -21,8 +21,7 @@     , base >= 4.11.1 && < 5     , binary >= 0.8 && < 0.11     , hashable >= 1.4 && < 1.5-    , aeson >= 2.1 && < 2.3-    , vector >= 0.11 && < 0.13+    , vector >= 0.11 && < 0.14     , quantification >= 0.7.0   default-language: Haskell2010   ghc-options: -O2 -Wall