on master help sign in
Rename
a43f3aeLennart Kolmodin
BitsGet.hs+7−7
@@ -259,8 +259,8 @@ runBitGet bg = do
259 putS bs''
259 putS bs''
260 return (Right x)
260 return (Right x)
261
261
262−ensure :: Int -> BitGet ()
262+ensureBits :: Int -> BitGet ()
263−ensure n = C $ \s kf ks ->
263+ensureBits n = C $ \s kf ks ->
264 let loop (S bs o) | n <= (B.length bs * 8 - o) = ks (S bs o) ()
264 let loop (S bs o) | n <= (B.length bs * 8 - o) = ks (S bs o) ()
265 | otherwise = do
265 | otherwise = do
266 needMore
266 needMore
@@ -270,19 +270,19 @@ ensure n = C $ \s kf ks ->
270 in loop s
270 in loop s
271
271
272getBool :: BitGet Bool
272getBool :: BitGet Bool
273−getBool = ensure 1 >> modifyState readBool
273+getBool = ensureBits 1 >> modifyState readBool
274
274
275getWord8 :: Int -> BitGet Word8
275getWord8 :: Int -> BitGet Word8
276−getWord8 n = ensure n >> modifyState (flip readWord8 n)
276+getWord8 n = ensureBits n >> modifyState (flip readWord8 n)
277
277
278getWord16be :: Int -> BitGet Word16
278getWord16be :: Int -> BitGet Word16
279−getWord16be n = ensure n >> modifyState (flip readWord16be n)
279+getWord16be n = ensureBits n >> modifyState (flip readWord16be n)
280
280
281getWord32be :: Int -> BitGet Word32
281getWord32be :: Int -> BitGet Word32
282−getWord32be n = ensure n >> modifyState (flip readWord32be n)
282+getWord32be n = ensureBits n >> modifyState (flip readWord32be n)
283
283
284getWord64be :: Int -> BitGet Word64
284getWord64be :: Int -> BitGet Word64
285−getWord64be n = ensure n >> modifyState (flip readWord64be n)
285+getWord64be n = ensureBits n >> modifyState (flip readWord64be n)
286
286
287getState :: BitGet S
287getState :: BitGet S
288getState = C $ \s kf ks -> ks s s
288getState = C $ \s kf ks -> ks s s