From aec496291de09c0387d51a3ee1fbdb5927b19c15 Mon Sep 17 00:00:00 2001 From: Sam Truzjan Date: Sun, 29 Sep 2013 08:37:41 +0400 Subject: Rename decode and encode to mimic Binary package This lead to more intuitive API. --- src/Data/BEncode.hs | 10 ++++------ src/Data/BEncode/Internal.hs | 12 ++++++------ 2 files changed, 10 insertions(+), 12 deletions(-) (limited to 'src') diff --git a/src/Data/BEncode.hs b/src/Data/BEncode.hs index 1969595..8dc7c89 100644 --- a/src/Data/BEncode.hs +++ b/src/Data/BEncode.hs @@ -73,8 +73,6 @@ module Data.BEncode -- * Serialization , encode , decode - , encoded - , decoded -- ** Dictionaries -- *** Building @@ -700,9 +698,9 @@ isDict _ = False --------------------------------------------------------------------} -- | The same as 'decode' but returns any bencodable value. -decoded :: BEncode a => ByteString -> Result a -decoded = decode >=> fromBEncode +decode :: BEncode a => ByteString -> Result a +decode = parse >=> fromBEncode -- | The same as 'encode' but takes any bencodable value. -encoded :: BEncode a => a -> Lazy.ByteString -encoded = encode . toBEncode +encode :: BEncode a => a -> Lazy.ByteString +encode = build . toBEncode diff --git a/src/Data/BEncode/Internal.hs b/src/Data/BEncode/Internal.hs index 30cfbe7..3552bc9 100644 --- a/src/Data/BEncode/Internal.hs +++ b/src/Data/BEncode/Internal.hs @@ -9,8 +9,8 @@ -- don't need to import this module. -- module Data.BEncode.Internal - ( decode - , encode + ( parse + , build , ppBEncode ) where @@ -59,8 +59,8 @@ builder = go -- | Convert bencoded value to raw bytestring according to the -- specification. -encode :: BValue -> Lazy.ByteString -encode = B.toLazyByteString . builder +build :: BValue -> Lazy.ByteString +build = B.toLazyByteString . builder {-------------------------------------------------------------------- -- Deserialization @@ -113,8 +113,8 @@ parser = valueP -- | Try to convert raw bytestring to bencoded value according to -- specification. -decode :: ByteString -> Either String BValue -decode = P.parseOnly parser +parse :: ByteString -> Either String BValue +parse = P.parseOnly parser {-------------------------------------------------------------------- Pretty Printing -- cgit v1.2.3