bytesmith 0.3.3.0 → 0.3.4.0

raw patch · 4 files changed

+72/−1 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

+ Data.Bytes.Parser.Latin: hexFixedWord32 :: e -> Parser e s Word32

Files

CHANGELOG.md +3/−0
bytesmith.cabal +1/−1
src/Data/Bytes/Parser/Latin.hs +38/−0
test/Main.hs +30/−0

CHANGELOG.md view

@@ -1,5 +1,8 @@ # Revision history for bytesmith +## 0.3.4.0 -- 2020-02-03+* Add `hexFixedWord32`.+ ## 0.3.3.0 -- 2020-01-22 * Add `hexWord8`, `hexWord16`, and `hexFixedWord8`.

bytesmith.cabal view

@@ -1,6 +1,6 @@ cabal-version: 2.2 name: bytesmith-version: 0.3.3.0+version: 0.3.4.0 synopsis: Nonresumable byte parser description:   Parse bytes as fast as possible. This is a nonresumable parser

src/Data/Bytes/Parser/Latin.hs view

@@ -72,6 +72,7 @@     -- *** Fixed Length   , hexFixedWord8   , hexFixedWord16+  , hexFixedWord32     -- *** Digit   , hexNibbleLower   , tryHexNibbleLower@@ -892,6 +893,43 @@   _ -> if indexLatinCharArray (array c) (offset c) /= w     then skipUntilConsumeLoop e w (Bytes.unsafeDrop 1 c)     else (# | (# (), unI (offset c + 1), unI (length c - 1) #) #)+++hexFixedWord32 :: e -> Parser e s Word32+{-# inline hexFixedWord32 #-}+hexFixedWord32 e = Parser+  (\x s0 -> case runParser (hexFixedWord32# e) x s0 of+    (# s1, r #) -> case r of+      (# err | #) -> (# s1, (# err | #) #)+      (# | (# a, b, c #) #) -> (# s1, (# | (# W32# a, b, c #) #) #)+  )++hexFixedWord32# :: e -> Parser e s Word#+{-# noinline hexFixedWord32# #-}+hexFixedWord32# e = uneffectfulWord# $ \chunk -> if length chunk >= 8+  then+    let !w0@(W# n0) = oneHex $ PM.indexByteArray (array chunk) (offset chunk)+        !w1@(W# n1) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 1)+        !w2@(W# n2) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 2)+        !w3@(W# n3) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 3)+        !w4@(W# n4) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 4)+        !w5@(W# n5) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 5)+        !w6@(W# n6) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 6)+        !w7@(W# n7) = oneHex $ PM.indexByteArray (array chunk) (offset chunk + 7)+     in if | w0 .|. w1 .|. w2 .|. w3 .|. w4 .|. w5 .|. w6 .|. w7 /= maxBound ->+             (# |+                (# (n0 `Exts.timesWord#` 268435456##) `Exts.plusWord#`+                   (n1 `Exts.timesWord#` 16777216##) `Exts.plusWord#`+                   (n2 `Exts.timesWord#` 1048576##) `Exts.plusWord#`+                   (n3 `Exts.timesWord#` 65536##) `Exts.plusWord#`+                   (n4 `Exts.timesWord#` 4096##) `Exts.plusWord#`+                   (n5 `Exts.timesWord#` 256##) `Exts.plusWord#`+                   (n6 `Exts.timesWord#` 16##) `Exts.plusWord#`+                   n7+                ,  unI (offset chunk) +# 8#+                ,  unI (length chunk) -# 8# #) #)+           | otherwise -> (# e | #)+  else (# e | #)  -- | Parse exactly four ASCII-encoded characters, interpretting -- them as the hexadecimal encoding of a 16-bit number. Note that

test/Main.hs view

@@ -309,6 +309,36 @@       P.parseBytes         (P.replicate 2 (Ascii.takeShortWhile (/=',') <* Ascii.char () ','))         (bytes "the,world,")+  , testGroup "hexFixedWord8"+    [ testCase "A" $+        P.parseBytes (Latin.hexFixedWord8 ()) (bytes "A") @=? P.Failure ()+    , testCase "B" $+        P.parseBytes (Latin.hexFixedWord8 ()) (bytes "0A") @=? P.Success (Slice 3 0 0x0A)+    , testCase "C" $+        P.parseBytes (Latin.hexFixedWord8 ()) (bytes "") @=? P.Failure ()+    , testCase "D" $+        P.parseBytes (Latin.hexFixedWord8 ()) (bytes "A!") @=? P.Failure ()+    ]+  , testGroup "hexFixedWord16"+    [ testCase "A" $+        P.parseBytes (Latin.hexFixedWord16 ()) (bytes "A") @=? P.Failure ()+    , testCase "B" $+        P.parseBytes (Latin.hexFixedWord16 ()) (bytes "0A0A") @=? P.Success (Slice 5 0 0x0A0A)+    , testCase "C" $+        P.parseBytes (Latin.hexFixedWord16 ()) (bytes "") @=? P.Failure ()+    , testCase "D" $+        P.parseBytes (Latin.hexFixedWord16 ()) (bytes "A!A!") @=? P.Failure ()+    ]+  , testGroup "hexFixedWord32"+    [ testCase "A" $+        P.parseBytes (Latin.hexFixedWord32 ()) (bytes "A") @=? P.Failure ()+    , testCase "B" $+        P.parseBytes (Latin.hexFixedWord32 ()) (bytes "0A0A0A0A") @=? P.Success (Slice 9 0 0x0A0A0A0A)+    , testCase "C" $+        P.parseBytes (Latin.hexFixedWord32 ()) (bytes "") @=? P.Failure ()+    , testCase "D" $+        P.parseBytes (Latin.hexFixedWord32 ()) (bytes "A!A0A0A0") @=? P.Failure ()+    ]   ]  bytes :: String -> Bytes