hinterface 0.8.2 → 0.8.3

raw patch · 3 files changed

+82/−18 lines, 3 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• hinterface.cabal +1/−1
• src/Foreign/Erlang/Term.hs +67/−17
• test/Foreign/Erlang/TermSpec.hs +14/−0

@@ -1,6 +1,6 @@ cabal-version: >=1.22 name: hinterface-version: 0.8.2+version: 0.8.3 license: BSD3 license-file: LICENSE copyright: 2016-2018 Timo Koepke, Sven Heyll

@@ -38,7 +38,9 @@     , MapEntry(.., (:=>))       -- ** Conversion to and from External Term Format     , ToTerm(..)+    , toTerms     , FromTerm(..)+    , fromTerms     , fromTermA       -- ** Constructors     , integer@@ -129,6 +131,7 @@ import           Data.Bits                      ( shiftR                                                 , (.&.)                                                 )+import           Data.List.NonEmpty     (NonEmpty(..)) import           Data.Monoid import           GHC.Exts as E import           GHC.Generics@@ -429,6 +432,22 @@     fromTerm (Tuple ts) | V.length ts == 0 = Just ()     fromTerm _ = Nothing +instance FromTerm Double where+    fromTerm (Float f) = Just f+    fromTerm _ = Nothing++instance FromTerm Bool where+    fromTerm "true" = Just True+    fromTerm "false" = Just False+    fromTerm _ = Nothing+instance FromTerm Integer where+    fromTerm (Integer i) = Just i+    fromTerm _ = Nothing++instance FromTerm String where+    fromTerm (String s) = Just (CS.unpack s)+    fromTerm _ = Nothing+ instance (FromTerm a) => FromTerm (Tuple1 a) where     fromTerm (Tuple ts) | V.length ts == 1 = Tuple1 <$> fromTerm (ts ! 0)     fromTerm _ = Nothing@@ -456,9 +475,43 @@                                                     <*> fromTerm (ts ! 4)     fromTerm _ = Nothing +instance FromTerm a => FromTerm (NonEmpty a) where+    fromTerm (List (toList -> xs) Nil) =+        case sequence (fromTerm <$> xs) of+            Just (h:t) -> Just (h :| t)+            _ -> Nothing+    fromTerm _ = Nothing++instance FromTerm a => FromTerm (Maybe a) where+    fromTerm (Tuple2 "ok" x) = Just <$> fromTerm x+    fromTerm "error" = Just Nothing+    fromTerm _ = Nothing++instance (FromTerm a, FromTerm b) => FromTerm (Either a b) where+    fromTerm (Tuple2 "ok" x) = Right <$> fromTerm x+    fromTerm (Tuple2 "error" x) = Left <$> fromTerm x+    fromTerm _ = Nothing++fromTerms :: FromTerm a => Term -> Maybe [a]+fromTerms (List (toList -> xs) Nil) = sequence (fromTerm <$> xs)+fromTerms _ = Nothing+ instance ToTerm () where     toTerm () = tuple [] +instance ToTerm Integer where+    toTerm = Integer++instance ToTerm String where+    toTerm = String . CS.pack++instance ToTerm Bool where+    toTerm True = "true"+    toTerm False = "false"++instance ToTerm Double where+    toTerm = Float+ instance (ToTerm a) => ToTerm (Tuple1 a) where     toTerm (Tuple1 a) = tuple [ toTerm a ] @@ -475,19 +528,19 @@     toTerm (a, b, c, d, e) =         tuple [ toTerm a, toTerm b, toTerm c, toTerm d, toTerm e ] -instance FromTerm Integer where-    fromTerm (Integer i) = Just i-    fromTerm _ = Nothing+instance ToTerm a => ToTerm (NonEmpty a) where+    toTerm = toTerms . toList -instance ToTerm Integer where-    toTerm = Integer+instance ToTerm a => ToTerm (Maybe a) where+    toTerm (Just x) = Tuple2 "ok" (toTerm x)+    toTerm Nothing = "error" -instance FromTerm String where-    fromTerm (String s) = Just (CS.unpack s)-    fromTerm _ = Nothing+instance (ToTerm a, ToTerm b) => ToTerm (Either a b) where+    toTerm (Left x) = Tuple2 "error" (toTerm x)+    toTerm (Right x) = Tuple2 "ok" (toTerm x) -instance ToTerm String where-    toTerm = String . CS.pack+toTerms :: ToTerm a => [a] -> Term+toTerms xs = List (fromList (toTerm <$> xs)) Nil  -------------------------------------------------------------------------------- -- | Construct an integer@@ -723,8 +776,7 @@         putWord8 new_float_ext         putDoublebe d -    put (Atom n) = do-        putAtom n+    put (Atom n) = putAtom n      put (Reference nodeName id creation) = do         putWord8 reference_ext@@ -760,8 +812,7 @@         putWord32be $ fromIntegral (V.length e)         mapM_ put e -    put Nil = do-        putWord8 nil_ext+    put Nil = putWord8 nil_ext      put (String s) = do         putWord8 string_ext@@ -783,8 +834,7 @@         putAtom node'         putWord8 creation         mapM_ putWord32be ids-    get = do-        lookAhead getWord8 >>= get'+    get = lookAhead getWord8 >>= get'       where         get' :: Word8 -> Get Term         get' tag@@ -883,7 +933,7 @@     f <$> (getWord32be >>= _getVector . fromIntegral)  getNil :: (() -> a) -> Get a-getNil f = do+getNil f =     f <$> matchWord8 nil_ext  getString :: (ByteString -> a) -> Get a

@@ -14,6 +14,7 @@ import           Data.ByteString.Char8          ( ) import qualified Data.ByteString.Lazy          as B import           Data.Word                      ( )+import           Data.List.NonEmpty             (NonEmpty(..)) import           Foreign.Erlang.Term import           Test.Hspec import           Test.QuickCheck@@ -28,6 +29,19 @@     it "represents all valid Erlang pids" $ property $ \x y z ->       let p = pid "nodename" x y z       in  fromTerm (decode (encode (toTerm p))) `shouldBe` (Just p)+  describe "FromTerm/ToTerm" $ do+    it "converts '[a]' back and forth"+      $ property+      $ \(xs :: [Integer]) -> fromTerms (toTerms xs) `shouldBe` Just xs+    it "converts 'Maybe a' back and forth"+      $ property+      $ \(x :: Maybe Bool) -> fromTerm (toTerm x) `shouldBe` Just x+    it "converts 'Either a b' back and forth"+      $ property+      $ \(x :: Either Integer Double) -> fromTerm (toTerm x) `shouldBe` Just x+    it "converts 'NonEmpty a' back and forth"+      $ property+      $ \(h :: Integer) (t :: [Integer]) -> let xs = h :| t in fromTerm (toTerm xs) `shouldBe` Just xs   describe "Integer"     $ it "has a Binary instance such that decode is the inverse of encode"     $ property