implemented setFlush and avail_input

1 files changed, 15 insertions, 7 deletions

diff --git a/haskell/Data/XDelta.hsc b/haskell/Data/XDelta.hsc
index d276a8d..03785c0 100644
--- a/haskell/Data/XDelta.hsc
+++ b/haskell/Data/XDelta.hsc
@@ -12,6 +12,7 @@ import Control.Monad.Primitive
 import Control.Monad.ST
 import Control.Monad.ST.Unsafe
 import Data.BA
+import Data.Bits
 import qualified Data.ByteString as B
 import qualified Data.ByteString.Unsafe as B
 import qualified Data.ByteString.Internal as B
@@ -185,21 +186,28 @@ data XDeltaMethods m u = XDeltaMethods
     , xInterleave :: forall a. m a -> m a
     }
 
--- | Checks for legal flag changes.
-foreign import ccall "xdelta3.h xd3_set_flags" xd3_set_flags :: Ptr Xd3Stream -> Flags -> IO ()
+-- -- | Checks for legal flag changes.
+-- foreign import ccall "xdelta3.h xd3_set_flags" xd3_set_flags :: Ptr Xd3Stream -> Flags -> IO ()
+
+setFlag :: PrimMonad m => Flags -> Stream m -> Bool -> m ()
+setFlag b stream wantFlush = do
+    f <- readAtByte (streamArray stream) #{offset xd3_stream, flags}
+    writeAtByte (streamArray stream) #{offset xd3_stream, flags}
+        . (coerce :: Flags -> Word32)
+        $ if wantFlush then Flags f .|. b
+                       else Flags f .&. complement b
 
 setFlush :: PrimMonad m => Stream m -> Bool -> m ()
-setFlush stream wantFlush = return () -- todo
+setFlush = setFlag XD3_FLUSH
 
 setSkipWindow :: PrimMonad m => Stream m -> Bool -> m ()
-setSkipWindow stream wantSkipWin = return () -- todo
+setSkipWindow = setFlag XD3_SKIP_WINDOW
 
 foreign import ccall "xdelta3.h xd3_avail_input" xd3_avail_input :: Ptr Xd3Stream -> Ptr a -> Usize_t -> IO ()
 
+avail_input :: PrimMonad m => Stream m -> Ptr a -> Usize_t -> m ()
 avail_input stream p sz =
-    -- withForeignPtr fp (\stream -> xd3_avail_input stream p sz)
-    -- TODO
-    return ()
+    unsafeIOToPrim $ xd3_avail_input (ptr $ mutableByteArrayContents $ streamArray stream) p sz
 
 -- | This acknowledges receipt of output data, must be called after any
 -- XD3_OUTPUT return.