Refactor writePrimFixed and writePrimBounded

meiersi · Nov 24, 2013 · 6deab94 · 6deab94
1 parent 03858ab
commit 6deab94
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/Blaze/ByteString/Builder/Compat/Write.hs b/Blaze/ByteString/Builder/Compat/Write.hs
@@ -21,11 +21,9 @@ import Data.ByteString.Builder.Prim.Internal
 import Blaze.ByteString.Builder.Internal.Write
 
 writePrimFixed :: FixedPrim a -> a -> Write
-writePrimFixed fe a = Write (size fe) (Poke wio)
-  where wio op = do
-           runF fe a op
-           return $! (op `plusPtr` size fe)
+writePrimFixed fe a = exactWrite (size fe) (runF fe a)
+{-# INLINE writePrimFixed #-}
 
 writePrimBounded :: BoundedPrim a -> a -> Write
-writePrimBounded be a = Write (sizeBound be) (Poke wio)
-  where wio = runB be a
+writePrimBounded be a = boundedWrite (sizeBound be) (Poke (runB be a))
+{-# INLINE writePrimBounded #-}
diff --git a/Blaze/ByteString/Builder/Internal/Write.hs b/Blaze/ByteString/Builder/Internal/Write.hs
@@ -145,7 +145,7 @@ instance Monoid Write where
 {-# INLINE pokeN #-}
 pokeN :: Int
        -> (Ptr Word8 -> IO ()) -> Poke
-pokeN size io = Poke $ \op -> io op >> return (op `plusPtr` size)
+pokeN size io = Poke $ \op -> io op >> (return $! (op `plusPtr` size))
 
 
 -- | @exactWrite size io@ creates a bounded write that can later be converted to