on master help sign in
Deprecate putWord*be
commitcb2cbc45f255231e962a92f92a501c14f35a6e47 authorSylvain Henry <hsyl20@gmail.com> dateFri 6 Mar 2015, 14:53 (12 years ago) parentaf483e8
3 files changed+22−7
BitsQC.hs+4−4 Data/Binary/Bits.hs+3−3 Data/Binary/Bits/Put.hs+15
BitsQC.hs+4−4
@@ -268,7 +268,7 @@ prop_bitreq (W w) = property $
268268prop_composite_case :: Bool -> W Word16 -> Property
269269prop_composite_case b (W w) = w < 0x8000 ==>
270270 let p = do putBool b
271− putWord16be 15 w
271+ putWord16 15 w
272272 g = do v <- getBool
273273 case v of
274274 True -> getWord16 15
@@ -446,9 +446,9 @@ putPrimitive p =
446446 case p of
447447 Bool b -> putBool b
448448 W8 n x -> putWord8 n x
449− W16 n x -> putWord16be n x
450− W32 n x -> putWord32be n x
451− W64 n x -> putWord64be n x
449+ W16 n x -> putWord16 n x
450+ W32 n x -> putWord32 n x
451+ W64 n x -> putWord64 n x
452452 BS _ bs -> putByteString bs
453453 LBS _ lbs -> mapM_ putByteString (L.toChunks lbs)
454454 IsEmpty -> return ()
Data/Binary/Bits.hs+3−3
@@ -33,13 +33,13 @@ instance BinaryBit Word8 where
3333 getBits = getWord8
3434
3535instance BinaryBit Word16 where
36− putBits = putWord16be
36+ putBits = putWord16
3737 getBits = getWord16
3838
3939instance BinaryBit Word32 where
40− putBits = putWord32be
40+ putBits = putWord32
4141 getBits = getWord32
4242
4343instance BinaryBit Word64 where
44− putBits = putWord64be
44+ putBits = putWord64
4545 getBits = getWord64
Data/Binary/Bits/Put.hs+15
@@ -23,6 +23,9 @@ module Data.Binary.Bits.Put
2323
2424 -- ** Words
2525 , putWord8
26+ , putWord16
27+ , putWord32
28+ , putWord64
2629 , putWord16be
2730 , putWord32be
2831 , putWord64be
@@ -111,16 +114,28 @@ putWord8 :: Int -> Word8 -> BitPut ()
111114putWord8 = putWord
112115
113116-- | Put the @n@ lower bits of a 'Word16'.
117+putWord16 :: Int -> Word16 -> BitPut ()
118+putWord16 = putWord
119+
114120putWord16be :: Int -> Word16 -> BitPut ()
115121putWord16be = putWord
122+{-# DEPRECATED putWord16be "Use 'putWord16' instead" #-}
116123
117124-- | Put the @n@ lower bits of a 'Word32'.
125+putWord32 :: Int -> Word32 -> BitPut ()
126+putWord32 = putWord
127+
118128putWord32be :: Int -> Word32 -> BitPut ()
119129putWord32be = putWord
130+{-# DEPRECATED putWord32be "Use 'putWord32' instead" #-}
120131
121132-- | Put the @n@ lower bits of a 'Word64'.
133+putWord64 :: Int -> Word64 -> BitPut ()
134+putWord64 = putWord
135+
122136putWord64be :: Int -> Word64 -> BitPut ()
123137putWord64be = putWord
138+{-# DEPRECATED putWord64be "Use 'putWord64' instead" #-}
124139
125140-- | Put a 'ByteString'.
126141--