7c40d65 · reflex · git.iko.soy

git.iko.soy/reflex

Merge remote-tracking branch 'origin/develop' into query

commit7c40d65122ec911d018f55bfa4b49a9c96a00195 authorLuigy Leon <luigy@outlook.com> dateMon 8 May 2017, 14:11 (9 years ago) parent13ed6c7 2fe0f56

2 files changed+8−1

compare with develop

unifiedsplit

src/Reflex/Requester/Base.hs+6−1 src/Reflex/Spider/Internal.hs+2

src/Reflex/Requester/Base.hs+6−1

@@ -45,7 +45,12 @@ import Data.Some (Some)

4545

4646-- | A basic implementation of 'Requester'.

4747newtype RequesterT t request response m a = RequesterT { unRequesterT :: EventWriterT t (DMap (Tag (PrimState m)) request) (ReaderT (EventSelector t (WrapArg response (Tag (PrimState m)))) m) a }

48− deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException, MonadAsyncException)

48+ deriving (Functor, Applicative, Monad, MonadFix, MonadIO, MonadException

49+-- MonadAsyncException can't be derived on ghc-8.0.1; we use base-4.9.1 as a proxy for ghc-8.0.2

50+#if MIN_VERSION_base(4,9,1)

51+ , MonadAsyncException

52+#endif

53+ )

4954

5055deriving instance MonadSample t m => MonadSample t (RequesterT t request response m)

5156deriving instance MonadHold t m => MonadHold t (RequesterT t request response m)

src/Reflex/Spider/Internal.hs+2

@@ -1639,6 +1639,8 @@ mergeCheapWithMove = mergeCheap' getInitialSubscribers updateMe destroy DMap.siz

16391639 let moveOrDelete :: forall a. k a -> PatchDMapWithMove.NodeInfo k (Event x) a -> MergeSubscribedParentWithMove x k a -> Constant (EventM x (Maybe (EventSubscription x))) a

16401640 moveOrDelete _ ni parent = Constant $ case getComposeMaybe $ PatchDMapWithMove._nodeInfo_to ni of

16411641 Nothing -> do

1642+ oldHeight <- liftIO $ getEventSubscribedHeight $ _eventSubscription_subscribed $ _mergeSubscribedParentWithMove_subscription parent

1643+ liftIO $ modifyIORef heightBagRef $ heightBagRemove oldHeight

16421644 return $ Just $ _mergeSubscribedParentWithMove_subscription parent

16431645 Just toKey -> do

16441646 liftIO $ writeIORef (_mergeSubscribedParentWithMove_key parent) $! toKey