git.iko.soy/binary-bits
on master help sign in
Add isEmpty
commit22c8278ad68b8b55b3693a01a1624465bb78ab3d authorAlexander Polakov <plhk@sdf.org> dateFri 29 Mar 2013, 03:43 (14 years ago) parentdc3e909
2 files changed+31−2
compare with master
unifiedsplit
BitsQC.hs+24 Data/Binary/Bits/Get.hs+7−2
BitsQC.hs+24
@@ -50,6 +50,13 @@ tests =
5050 prop_getLazyByteString_equal_to_ByteString2
5151 ]
5252
53+ , testGroup "isEmpty"
54+ [ testProperty "prop_isEmptyOfEmptyEmpty" prop_isEmptyOfEmptyEmpty
55+ , testProperty "prop_isEmptyOfNonEmptyEmpty" prop_isEmptyOfNonEmptyEmpty
56+ , testProperty "prop_isEmptyOfConsumedEmpty" prop_isEmptyOfConsumedEmpty
57+ , testProperty "prop_isEmptyOfNotConsumedNotEmpty" prop_isEmptyOfNotConsumedNotEmpty
58+ ]
59+
5360 , testGroup "Fail"
5461 [ testProperty "monadic fail" prop_fail ]
5562
@@ -117,6 +124,23 @@ tests =
117124 ]
118125 ]
119126
127+prop_isEmptyOfEmptyEmpty :: Bool
128+prop_isEmptyOfEmptyEmpty = runGet (runBitGet isEmpty) L.empty
129+
130+prop_isEmptyOfNonEmptyEmpty :: L.ByteString -> Property
131+prop_isEmptyOfNonEmptyEmpty bs =
132+ not (L.null bs) ==> runGet (runBitGet isEmpty) bs == False
133+
134+prop_isEmptyOfConsumedEmpty :: L.ByteString -> Int -> Property
135+prop_isEmptyOfConsumedEmpty bs n =
136+ (fromIntegral n) == L.length bs && not (L.null bs) ==>
137+ runGet (runBitGet (getByteString n >> isEmpty)) bs == True
138+
139+prop_isEmptyOfNotConsumedNotEmpty :: L.ByteString -> Int -> Property
140+prop_isEmptyOfNotConsumedNotEmpty bs n =
141+ (fromIntegral n) < L.length bs && not (L.null bs) ==>
142+ runGet (runBitGet (getByteString n >> isEmpty)) bs == False
143+
120144prop_getLazyByteString_equal_to_ByteString :: L.ByteString -> Int -> Property
121145prop_getLazyByteString_equal_to_ByteString bs n =
122146 (fromIntegral n) <= L.length bs ==>
Data/Binary/Bits/Get.hs+7−2
@@ -79,10 +79,11 @@ module Data.Binary.Bits.Get
7979 , byteString
8080 , Data.Binary.Bits.Get.getByteString
8181 , Data.Binary.Bits.Get.getLazyByteString
82+ , Data.Binary.Bits.Get.isEmpty
8283
8384 ) where
8485
85−import Data.Binary.Get as B ( runGet, Get, getByteString, getLazyByteString )
86+import Data.Binary.Get as B ( runGet, Get, getByteString, getLazyByteString, isEmpty )
8687import Data.Binary.Get.Internal as B ( get, put, ensureN )
8788
8889import Data.ByteString as B
@@ -91,7 +92,6 @@ import Data.ByteString.Unsafe
9192
9293import Data.Bits
9394import Data.Word
94−
9595import Control.Applicative
9696
9797import Prelude as P
@@ -427,6 +427,11 @@ getLazyByteString n = do
427427 return (S B.empty 0, lbs)
428428 _ -> L.fromChunks . (:[]) <$> Data.Binary.Bits.Get.getByteString n
429429
430+-- | Test whether all input has been consumed, i.e. there are no remaining
431+-- undecoded bytes.
432+isEmpty :: BitGet Bool
433+isEmpty = B $ \ (S bs o) -> B.isEmpty >>= \e -> return (S bs o, e)
434+
430435-- | Read a 1 bit 'Bool'.
431436bool :: Block Bool
432437bool = Block 1 readBool