7124284 · binary-bits · git.iko.soy

git.iko.soy/binary-bits

Deprecate functions with "be" suffix

commit712428481625fa68d53b86a0facb77cd50344537 authorSylvain HENRY <hsyl20@gmail.com> dateMon 2 Mar 2015, 00:40 (12 years ago) parent0e68a2b

2 files changed+39−9

compare with master

unifiedsplit

Data/Binary/Bits.hs+3−3 Data/Binary/Bits/Get.hs+36−6

Data/Binary/Bits.hs+3−3

@@ -34,12 +34,12 @@ instance BinaryBit Word8 where

3434

3535instance BinaryBit Word16 where

3636 putBits = putWord16be

37− getBits = getWord16be

37+ getBits = getWord16

3838

3939instance BinaryBit Word32 where

4040 putBits = putWord32be

41− getBits = getWord32be

41+ getBits = getWord32

4242

4343instance BinaryBit Word64 where

4444 putBits = putWord64be

45− getBits = getWord64be

45+ getBits = getWord64

Data/Binary/Bits/Get.hs+36−6

@@ -62,6 +62,9 @@ module Data.Binary.Bits.Get

6262 -- ** Get bytes

6363 , getBool

6464 , getWord8

65+ , getWord16

66+ , getWord32

67+ , getWord64

6568 , getWord16be

6669 , getWord32be

6770 , getWord64be

@@ -79,6 +82,9 @@ module Data.Binary.Bits.Get

7982 -- ** Read in Blocks

8083 , bool

8184 , word8

85+ , word16

86+ , word32

87+ , word64

8288 , word16be

8389 , word32be

8490 , word64be

@@ -395,16 +401,28 @@ getWord8 :: Int -> BitGet Word8

395401getWord8 n = block (word8 n)

396402

397403-- | Get @n@ bits as a 'Word16'. @n@ must be within @[0..16]@.

404+getWord16 :: Int -> BitGet Word16

405+getWord16 n = block (word16 n)

406+

398407getWord16be :: Int -> BitGet Word16

399−getWord16be n = block (word16be n)

408+getWord16be = getWord16

409+{-# DEPRECATED getWord16be "Use 'getWord16' instead" #-}

400410

401411-- | Get @n@ bits as a 'Word32'. @n@ must be within @[0..32]@.

412+getWord32 :: Int -> BitGet Word32

413+getWord32 n = block (word32 n)

414+

402415getWord32be :: Int -> BitGet Word32

403−getWord32be n = block (word32be n)

416+getWord32be = getWord32

417+{-# DEPRECATED getWord32be "Use 'getWord32' instead" #-}

404418

405419-- | Get @n@ bits as a 'Word64'. @n@ must be within @[0..64]@.

420+getWord64 :: Int -> BitGet Word64

421+getWord64 n = block (word64 n)

422+

406423getWord64be :: Int -> BitGet Word64

407−getWord64be n = block (word64be n)

424+getWord64be = getWord64

425+{-# DEPRECATED getWord64be "Use 'getWord64' instead" #-}

408426

409427-- | Get @n@ bytes as a 'ByteString'.

410428getByteString :: Int -> BitGet ByteString

@@ -458,16 +476,28 @@ word8 :: Int -> Block Word8

458476word8 n = Block n (readWordChecked 8 n)

459477

460478-- | Read @n@ bits as a 'Word16'. @n@ must be within @[0..16]@.

479+word16 :: Int -> Block Word16

480+word16 n = Block n (readWordChecked 16 n)

481+

461482word16be :: Int -> Block Word16

462−word16be n = Block n (readWordChecked 16 n)

483+word16be = word16

484+{-# DEPRECATED word16be "Use 'word16' instead" #-}

463485

464486-- | Read @n@ bits as a 'Word32'. @n@ must be within @[0..32]@.

487+word32 :: Int -> Block Word32

488+word32 n = Block n (readWordChecked 32 n)

489+

465490word32be :: Int -> Block Word32

466−word32be n = Block n (readWordChecked 32 n)

491+word32be = word32

492+{-# DEPRECATED word32be "Use 'word32' instead" #-}

467493

468494-- | Read @n@ bits as a 'Word64'. @n@ must be within @[0..64]@.

495+word64 :: Int -> Block Word64

496+word64 n = Block n (readWordChecked 64 n)

497+

469498word64be :: Int -> Block Word64

470−word64be n = Block n (readWordChecked 64 n)

499+word64be = word64

500+{-# DEPRECATED word64be "Use 'word64' instead" #-}

471501

472502-- | Read @n@ bytes as a 'ByteString'.

473503byteString :: Int -> Block ByteString