Use plain functions instead of type class instances

Author: jacereda

src/Data/ArrayBuffer/Deserializer.purs

@@ -11,15 +11,11 @@ import qualified Data.ArrayBuffer.DataView as DV
 
 type Deserializer = Advancer
 
-class IsDeserializable a where
-  get :: forall e. Deserializer -> Eff (reader :: DV.Reader | e) (Either String a)
-
 chkErr :: forall a e. Maybe a -> Either String a
 chkErr x = case x of
   (Just v) -> Right v
   otherwise -> Left "Short read"
 
-
 getInt8 :: forall e. Deserializer -> Eff (reader :: DV.Reader | e) (Either String Int8)
 getInt8 d =  chkErr <$> (advance 1 d >>= DV.getInt8 d.dv)
 getInt16 d = chkErr <$> (advance 2 d >>= DV.getInt16 d.dv)
@@ -30,23 +26,6 @@ getUint32 d = chkErr <$> (advance 4 d >>= DV.getUint32 d.dv)
 getFloat32 d = chkErr <$> (advance 4 d >>= DV.getFloat32 d.dv)
 getFloat64 d = chkErr <$> (advance 8 d >>= DV.getFloat64 d.dv)
 
-instance isDeserializableInt8 :: IsDeserializable Int8 where
-  get = getInt8
-instance isDeserializableInt16 :: IsDeserializable Int16 where
-  get = getInt16
-instance isDeserializableInt32 :: IsDeserializable Int32 where
-  get = getInt32
-instance isDeserializableUint8 :: IsDeserializable Uint8 where
-  get = getUint8
-instance isDeserializableUint16 :: IsDeserializable Uint16 where
-  get = getUint16
-instance isDeserializableUint32 :: IsDeserializable Uint32 where
-  get = getUint32
-instance isDeserializableFloat32 :: IsDeserializable Float32 where
-  get = getFloat32
-instance isDeserializableFloat64 :: IsDeserializable Float64 where
-  get = getFloat64
-
 getDataView :: forall e. Deserializer -> ByteLength -> Eff (reader :: DV.Reader | e) (Either String DV.DataView)
 getDataView d n = do
   o <- advance n d
@@ -64,7 +43,6 @@ getTypedArray d sz conv = do
     Right dv -> Right $ conv dv
     Left err -> Left err
 
-
 getInt8Array :: AD TA.Int8Array
 getInt8Array d n = getTypedArray d n TA.asInt8Array
 getInt16Array :: AD TA.Int16Array

src/Data/ArrayBuffer/Serializer.purs

@@ -10,25 +10,14 @@ import Control.Monad.Eff
 
 type Serializer = Advancer
 
-class IsSerializable a where
-  put :: forall e. Serializer -> a -> Eff (writer :: DV.Writer | e) Unit
-
-instance isSerializableInt8 :: IsSerializable Int8 where
-  put s v = advance 1 s >>= DV.setInt8 s.dv v
-instance isSerializableInt16 :: IsSerializable Int16 where
-  put s v = advance 2 s >>= DV.setInt16 s.dv v
-instance isSerializableInt32 :: IsSerializable Int32 where
-  put s v = advance 4 s >>= DV.setInt32 s.dv v
-instance isSerializableUint8 :: IsSerializable Uint8 where
-  put s v = advance 1 s >>= DV.setUint8 s.dv v
-instance isSerializableUint16 :: IsSerializable Uint16 where
-  put s v = advance 2 s >>= DV.setUint16 s.dv v
-instance isSerializableUint32 :: IsSerializable Uint32 where
-  put s v = advance 4 s >>= DV.setUint32 s.dv v
-instance isSerializableFloat32 :: IsSerializable Float32 where
-  put s v = advance 4 s >>= DV.setFloat32 s.dv v
-instance isSerializableFloat64 :: IsSerializable Float64 where
-  put s v = advance 8 s >>= DV.setFloat64 s.dv v
+putInt8 s v = advance 1 s >>= DV.setInt8 s.dv v
+putInt16 s v = advance 2 s >>= DV.setInt16 s.dv v
+putInt32 s v = advance 4 s >>= DV.setInt32 s.dv v
+putUint8 s v = advance 1 s >>= DV.setUint8 s.dv v
+putUint16 s v = advance 2 s >>= DV.setUint16 s.dv v
+putUint32 s v = advance 4 s >>= DV.setUint32 s.dv v
+putFloat32 s v = advance 4 s >>= DV.setFloat32 s.dv v
+putFloat64 s v = advance 8 s >>= DV.setFloat64 s.dv v
 
 mapDataView :: forall e. Serializer -> ByteLength -> Eff (writer :: DV.Writer | e) (Maybe DV.DataView)
 mapDataView s n = do

test/Main.purs

@@ -18,11 +18,10 @@ import Math
 
 newtype Comp = Comp Number
 
-instance isSerializableComp :: S.IsSerializable Comp where
-  put d (Comp v) = S.put d $ Int8 v
+putComp d (Comp v) = S.putInt8 d $ Int8 v
 
-instance isDeserializableComp :: D.IsDeserializable Comp where
-  get d = do
+
+getComp d = do
     v <- D.getInt8 d
     return $ case v of
       (Right (Int8 vv)) -> Right $ Comp vv
@@ -52,17 +51,15 @@ instance showV4 :: Show V4 where
 instance arbV4 :: Arbitrary V4 where
   arbitrary = V4 <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
 
-instance v4IsSerializable :: S.IsSerializable V4 where
-  put d (V4 x y z t) = do
-    let i8 = S.put d
+putV4 d (V4 x y z t) = do
+    let i8 = putComp d
     i8 x
     i8 y
     i8 z
     i8 t
 
-instance v4IsDeserializable :: D.IsDeserializable V4 where
-  get d = do
-    let comp = D.get d
+getV4 d = do
+    let comp = getComp d
     x <- comp
     y <- comp
     z <- comp
@@ -82,17 +79,15 @@ instance arbM4 :: Arbitrary M4 where
   arbitrary = M4 <$> arbitrary <*> arbitrary <*> arbitrary <*> arbitrary
 
 
-instance m4IsSerializable :: S.IsSerializable M4 where
-  put d (M4 x y z t) = do
-    let v4 = S.put d
+putM4 d (M4 x y z t) = do
+    let v4 = putV4 d
     v4 x
     v4 y
     v4 z
     v4 t
 
-instance m4IsDeserializable :: D.IsDeserializable M4 where
-  get d = do
-    let v4= D.get d
+getM4 d = do
+    let v4= getV4 d
     x <- v4
     y <- v4
     z <- v4
@@ -145,13 +140,13 @@ main = do
 serdes :: M4 -> M4 -> M4 -> M4 -> Boolean
 serdes m0 m1 m2 m3 = forcePure $ do
     a <- S.serialized 256 $ \s -> do
-      let p = S.put s
+      let p = putM4 s
       p m0
       p m1
       p m2
       p m3      
     d <- D.deserializer a
-    let g = D.get d
+    let g = getM4 d
     m0' <- g
     m1' <- g
     m2' <- g
@@ -161,10 +156,10 @@ serdes m0 m1 m2 m3 = forcePure $ do
 short :: M4 -> M4 -> Boolean
 short m0 m1 = forcePure $ do
     a <- S.serialized 256 $ \s -> do
-      let p = S.put s
+      let p = putM4 s
       p m0
     d <- D.deserializer a
-    let g = D.get d
+    let g = getM4 d
     m0' <- g
     m1' <- g
     return $ m0' == (Right m0) && m1' /= (Right m1) && m1' == (Left "Short read")