on master help sign in
Fix warnings
commit0206987cde1556971c32acb9f1c5043476f9ce60 authorHamish Mackenzie <Hamish.K.Mackenzie@googlemail.com> dateThu 22 Jun 2017, 01:39 (9 years ago) parenta4ff79c
2 files changed+6−8
jsaddle/src/Language/Javascript/JSaddle/Native/Internal.hs+1−1 jsaddle/src/Language/Javascript/JSaddle/Run.hs+5−7
jsaddle/src/Language/Javascript/JSaddle/Native/Internal.hs+1−1
@@ -62,7 +62,7 @@ wrapJSString :: MonadIO m => JSStringReceived -> m JSString
6262wrapJSString (JSStringReceived ref) = return $ JSString ref
6363
6464withJSVal :: MonadIO m => JSVal -> (JSValueForSend -> m a) -> m a
65−withJSVal v@(JSVal ref) f = do
65+withJSVal (JSVal ref) f = do
6666 result <- f (JSValueForSend ref)
6767 liftIO $ touch ref
6868 return result
jsaddle/src/Language/Javascript/JSaddle/Run.hs+5−7
@@ -55,15 +55,13 @@ import Control.Concurrent.MVar
5555 (tryTakeMVar, MVar, putMVar, takeMVar, newMVar, newEmptyMVar, readMVar, modifyMVar)
5656
5757import System.IO.Unsafe (unsafeInterleaveIO)
58−import System.Mem.Weak (addFinalizer, mkWeak)
58+import System.Mem.Weak (addFinalizer)
5959
60−import GHC.Int (Int64(..))
6160import GHC.Base (IO(..), mkWeak#)
6261import GHC.Conc (ThreadId(..))
6362import Data.Monoid ((<>))
6463import qualified Data.Text as T (unpack, pack)
6564import qualified Data.Map as M (lookup, delete, insert, empty, size)
66−import Data.Set (Set)
6765import qualified Data.Set as S (empty, member, insert, delete)
6866import Data.UUID.V4 (nextRandom)
6967import Data.Time.Clock (getCurrentTime,diffUTCTime)
@@ -163,7 +161,7 @@ runJavaScript sendBatch entryPoint = do
163161 commandChan <- newTChanIO
164162 callbacks <- newTVarIO M.empty
165163 nextRef' <- newTVarIO 0
166− finalizerThreads <- newMVar S.empty
164+ finalizerThreads' <- newMVar S.empty
167165 loggingEnabled <- newIORef False
168166 let ctx = JSContextRef {
169167 contextId = contextId'
@@ -180,7 +178,7 @@ runJavaScript sendBatch entryPoint = do
180178 , freeCallback = \(Object (JSVal val)) -> atomically $ modifyTVar' callbacks (M.delete val)
181179 , nextRef = nextRef'
182180 , doEnableLogging = atomicWriteIORef loggingEnabled
183− , finalizerThreads = finalizerThreads
181+ , finalizerThreads = finalizerThreads'
184182 }
185183 let processResults :: Bool -> Results -> IO ()
186184 processResults syncCallbacks = \case
@@ -238,7 +236,7 @@ runJavaScript sendBatch entryPoint = do
238236 where
239237 numberForeverFromM_ :: (Monad m, Enum n) => n -> (n -> m a) -> m ()
240238 numberForeverFromM_ !n f = do
241− f n
239+ _ <- f n
242240 numberForeverFromM_ (succ n) f
243241 takeResult recvMVar nBatch =
244242 takeMVar recvMVar >>= \case
@@ -284,7 +282,7 @@ wrapJSVal (JSValueReceived ref) = do
284282 ctx <- JSM ask
285283 liftIO . addFinalizer ref $ do
286284 ft <- takeMVar $ finalizerThreads ctx
287− t@(ThreadId t#) <- myThreadId
285+ t <- myThreadId
288286 let tname = T.pack $ show t
289287 doSendAsyncCommand ctx $ FreeRef tname $ JSValueForSend ref
290288 if tname `S.member` ft