@@ -9,7 +9,6 @@
9{-# LANGUAGE GADTs #-}
9{-# LANGUAGE GADTs #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
10{-# LANGUAGE GeneralizedNewtypeDeriving #-}
11{-# LANGUAGE LambdaCase #-}
11{-# LANGUAGE LambdaCase #-}
12−{-# LANGUAGE MultiWayIf #-}
13{-# LANGUAGE RankNTypes #-}
12{-# LANGUAGE RankNTypes #-}
14{-# LANGUAGE RoleAnnotations #-}
13{-# LANGUAGE RoleAnnotations #-}
15{-# LANGUAGE ScopedTypeVariables #-}
14{-# LANGUAGE ScopedTypeVariables #-}
@@ -20,7 +19,7 @@
20{-# LANGUAGE DeriveFunctor #-}
19{-# LANGUAGE DeriveFunctor #-}
21{-# LANGUAGE StandaloneDeriving #-}
20{-# LANGUAGE StandaloneDeriving #-}
22{-# LANGUAGE InstanceSigs #-}
21{-# LANGUAGE InstanceSigs #-}
23−{-# LANGUAGE RecursiveDo #-}
22+{-# LANGUAGE MultiWayIf #-}
25#ifdef USE_REFLEX_OPTIMIZER
24#ifdef USE_REFLEX_OPTIMIZER
26{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -39,15 +38,17 @@ import Control.Monad hiding (forM, forM_, mapM, mapM_)
39import Control.Monad.Exception
38import Control.Monad.Exception
40import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
39import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)
41import Control.Monad.Primitive
40import Control.Monad.Primitive
42−--import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)
43import Control.Monad.Reader.Class
41import Control.Monad.Reader.Class
44import Control.Monad.IO.Class
42import Control.Monad.IO.Class
45import Control.Monad.ReaderIO
43import Control.Monad.ReaderIO
46import Control.Monad.Ref
44import Control.Monad.Ref
45+import Control.Monad.Fail (MonadFail)
46+import qualified Control.Monad.Fail as MonadFail
47import Data.Align
47import Data.Align
48import Data.Coerce
48import Data.Coerce
49−import Data.Dependent.Map (DMap, DSum (..))
49+import Data.Dependent.Map (DMap)
50import qualified Data.Dependent.Map as DMap
50import qualified Data.Dependent.Map as DMap
51+import Data.Dependent.Sum (DSum (..))
51import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
52import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))
52import qualified Data.FastMutableIntMap as FastMutableIntMap
53import qualified Data.FastMutableIntMap as FastMutableIntMap
53import Data.Foldable hiding (concat, elem, sequence_)
54import Data.Foldable hiding (concat, elem, sequence_)
@@ -64,6 +65,7 @@ import Data.Monoid (mempty, (<>))
64import Data.Proxy
65import Data.Proxy
65import Data.These
66import Data.These
66import Data.Traversable
67import Data.Traversable
68+import Data.Type.Equality ((:~:)(Refl))
67import Data.Witherable (Filterable, mapMaybe)
69import Data.Witherable (Filterable, mapMaybe)
68import GHC.Exts hiding (toList)
70import GHC.Exts hiding (toList)
69import GHC.IORef (IORef (..))
71import GHC.IORef (IORef (..))
@@ -84,9 +86,9 @@ import Data.Zip (Zip (..))
85#ifdef DEBUG_CYCLES
87#ifdef DEBUG_CYCLES
86import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
88import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
87−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
91+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
90import qualified Data.List.NonEmpty as NonEmpty
92import qualified Data.List.NonEmpty as NonEmpty
91import Data.Tree (Forest, Tree (..), drawForest)
93import Data.Tree (Forest, Tree (..), drawForest)
92import Data.List (isPrefixOf)
94import Data.List (isPrefixOf)
@@ -104,15 +106,21 @@ import qualified Reflex.Class
104import qualified Reflex.Class as R
106import qualified Reflex.Class as R
105import qualified Reflex.Host.Class
107import qualified Reflex.Host.Class
106import Reflex.NotReady.Class
108import Reflex.NotReady.Class
107−import Reflex.Patch
109+import Data.Patch
108−import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove
110+import qualified Data.Patch.DMapWithMove as PatchDMapWithMove
109import Reflex.PerformEvent.Base (PerformEventT)
111import Reflex.PerformEvent.Base (PerformEventT)
111#ifdef DEBUG_TRACE_EVENTS
113#ifdef DEBUG_TRACE_EVENTS
112import qualified Data.ByteString.Char8 as BS8
114import qualified Data.ByteString.Char8 as BS8
113import System.IO (stderr)
115import System.IO (stderr)
114import Data.List (isPrefixOf)
116import Data.List (isPrefixOf)
119+-- TODO stdout might not be the best channel for debug output
120+debugStrLn :: String -> IO ()
121+debugStrLn = putStrLn
123+#ifdef DEBUG_TRACE_EVENTS
116withStackOneLine :: (BS8.ByteString -> a) -> a
124withStackOneLine :: (BS8.ByteString -> a) -> a
117withStackOneLine expr = unsafePerformIO $ do
125withStackOneLine expr = unsafePerformIO $ do
118 stack <- currentCallStack
126 stack <- currentCallStack
@@ -121,9 +129,33 @@ withStackOneLine expr = unsafePerformIO $ do
132+debugPropagate :: Bool
134+debugInvalidateHeight :: Bool
136+debugInvalidate :: Bool
124#ifdef DEBUG
138#ifdef DEBUG
125#define DEBUG_NODEIDS
139#define DEBUG_NODEIDS
141+#ifdef DEBUG_TRACE_PROPAGATION
142+debugPropagate = True
144+debugPropagate = False
147+#ifdef DEBUG_TRACE_HEIGHT
148+debugInvalidateHeight = True
150+debugInvalidateHeight = False
153+#ifdef DEBUG_TRACE_INVALIDATION
154+debugInvalidate = True
156+debugInvalidate = False
127class HasNodeId a where
159class HasNodeId a where
128 getNodeId :: a -> Int
160 getNodeId :: a -> Int
@@ -161,11 +193,19 @@ showNodeId' = ("#"<>) . show
196+debugPropagate = False
197+debugInvalidateHeight = False
198+debugInvalidate = False
164-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
200-- This must be inline, or error messages will cause memory leaks due to retaining the node in question
165{-# INLINE showNodeId #-}
201{-# INLINE showNodeId #-}
166showNodeId :: a -> String
202showNodeId :: a -> String
167showNodeId _ = ""
203showNodeId _ = ""
205+{-# INLINE showNodeId' #-}
206+showNodeId' :: Int -> String
171#ifdef DEBUG_NODEIDS
211#ifdef DEBUG_NODEIDS
@@ -213,11 +253,11 @@ subscribeAndRead = unEvent
213{-# INLINE [1] pushCheap #-}
253{-# INLINE [1] pushCheap #-}
214pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
254pushCheap :: HasSpiderTimeline x => (a -> ComputeM x (Maybe b)) -> Event x a -> Event x b
215pushCheap !f e = Event $ \sub -> do
255pushCheap !f e = Event $ \sub -> do
216− (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" (sub
256+ (subscription, occ) <- subscribeAndRead e $ debugSubscriber' "push" $ sub
217 { subscriberPropagate = \a -> do
257 { subscriberPropagate = \a -> do
218 mb <- f a
258 mb <- f a
219 mapM_ (subscriberPropagate sub) mb
259 mapM_ (subscriberPropagate sub) mb
221 occ' <- join <$> mapM f occ
261 occ' <- join <$> mapM f occ
222 return (subscription, occ')
262 return (subscription, occ')
@@ -267,7 +307,20 @@ data CacheSubscribed x a
270−
310+nowSpiderEventM :: (HasSpiderTimeline x) => EventM x (R.Event (SpiderTimeline x) ())
314+now :: (MonadIO m, Defer (Some Clear) m, HasSpiderTimeline x
317+ nowOrNot <- liftIO $ newIORef $ Just ()
318+ scheduleClear nowOrNot
319+ return . Event $ \_ -> do
320+ occ <- liftIO . readIORef $ nowOrNot
321+ return ( EventSubscription (return ()) eventSubscribedNow
272-- | Construct an 'Event' whose value is guaranteed not to be recomputed
325-- | Construct an 'Event' whose value is guaranteed not to be recomputed
273-- repeatedly
326-- repeatedly
@@ -298,39 +351,18 @@ cacheEvent e =
299 subscribers <- liftIO FastWeakBag.empty
352 subscribers <- liftIO FastWeakBag.empty
300 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
353 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
301−<<<<<<< HEAD
354+#ifdef DEBUG_NODEIDS
302 (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
355 (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
357+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
303 { subscriberPropagate = \a -> do
359 { subscriberPropagate = \a -> do
304− -- checkCycle (_eventSubscription_subscribed parentSub)
305 liftIO $ writeIORef occRef (Just a)
360 liftIO $ writeIORef occRef (Just a)
306 scheduleClear occRef
361 scheduleClear occRef
307 propagateFast a subscribers
362 propagateFast a subscribers
308− , subscriberInvalidateHeight = FastWeakBag.traverse subscribers . invalidateSubscriberHeight
363+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
309− , subscriberRecalculateHeight = FastWeakBag.traverse subscribers . recalculateSubscriberHeight
364+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
311−||||||| merged common ancestors
312− (parentSub, occ) <- subscribeAndRead e $ Subscriber
313− { subscriberPropagate = \a -> do
314− liftIO $ writeIORef occRef $ Just a
315− scheduleClear occRef
316− propagateFast a subscribers
317− , subscriberInvalidateHeight = \old -> do
318− FastWeakBag.traverse subscribers $ invalidateSubscriberHeight old
319− , subscriberRecalculateHeight = \new -> do
320− FastWeakBag.traverse subscribers $ recalculateSubscriberHeight new
323− (parentSub, occ) <- subscribeAndRead e $ Subscriber
324− { subscriberPropagate = \a -> do
325− liftIO $ writeIORef occRef $ Just a
326− scheduleClear occRef
327− propagateFast a subscribers
328− , subscriberInvalidateHeight = \old -> do
329− FastWeakBag.traverse_ subscribers $ invalidateSubscriberHeight old
330− , subscriberRecalculateHeight = \new -> do
331− FastWeakBag.traverse_ subscribers $ recalculateSubscriberHeight new
334 when (isJust occ) $ do
366 when (isJust occ) $ do
335 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
367 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
336 scheduleClear occRef
368 scheduleClear occRef
@@ -432,16 +464,6 @@ data Subscriber x a = Subscriber
432 , subscriberRecalculateHeight :: !(Height -> IO ())
464 , subscriberRecalculateHeight :: !(Height -> IO ())
435−--TODO: Move this comment to WeakBag
436−-- These function are constructor functions that are marked NOINLINE so they are
437−-- opaque to GHC. If we do not do this, then GHC will sometimes fuse the constructor away
438−-- so any weak references that are attached to the constructors will have their
439−-- finalizer run. Using the opaque constructor, does not see the
440−-- constructor application, so it behaves like an IORef and cannot be fused away.
442−-- The result is also evaluated to WHNF, since forcing a thunk invalidates
443−-- the weak pointer to it in some cases.
445newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
467newSubscriberHold :: (HasSpiderTimeline x, Patch p) => Hold x p -> IO (Subscriber x p)
446newSubscriberHold h = return $ Subscriber
468newSubscriberHold h = return $ Subscriber
447 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
469 { subscriberPropagate = {-# SCC "traverseHold" #-} propagateSubscriberHold h
@@ -585,6 +607,16 @@ eventSubscribedNever = EventSubscribed
585 , eventSubscribedWhoCreated = return ["never"]
607 , eventSubscribedWhoCreated = return ["never"]
610+eventSubscribedNow :: EventSubscribed x
611+eventSubscribedNow = EventSubscribed
612+ { eventSubscribedHeightRef = zeroRef
613+ , eventSubscribedRetained = toAny ()
615+ , eventSubscribedGetParents = return []
616+ , eventSubscribedHasOwnHeightRef = False
617+ , eventSubscribedWhoCreated = return ["now"]
589eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
621eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
590eventSubscribedFan !subscribed = EventSubscribed
622eventSubscribedFan !subscribed = EventSubscribed
@@ -962,8 +994,10 @@ instance Monad (BehaviorM x) where
962 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
994 BehaviorM x >> BehaviorM y = BehaviorM $ x >> y
963 {-# INLINE return #-}
995 {-# INLINE return #-}
964 return x = BehaviorM $ return x
996 return x = BehaviorM $ return x
997+#if !MIN_VERSION_base(4,13,0)
965 {-# INLINE fail #-}
998 {-# INLINE fail #-}
966 fail s = BehaviorM $ fail s
999 fail s = BehaviorM $ fail s
968data BehaviorSubscribed x a
1002data BehaviorSubscribed x a
969 = forall p. BehaviorSubscribedHold (Hold x p)
1003 = forall p. BehaviorSubscribedHold (Hold x p)
@@ -1312,7 +1346,7 @@ mkWeakPtrWithDebug x debugNote = do
1312 x' <- evaluate x
1346 x' <- evaluate x
1313 mkWeakPtr x' $
1347 mkWeakPtr x' $
1314 if debugFinalize
1348 if debugFinalize
1315− then Just $ putStrLn $ "finalizing: " ++ debugNote
1349+ then Just $ debugStrLn $ "finalizing: " ++ debugNote
1316 else Nothing
1350 else Nothing
1318type WeakList a = [Weak a]
1352type WeakList a = [Weak a]
@@ -1334,13 +1368,13 @@ debugSubscriber' description subscribed = Subscriber
1334 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1368 tracePropagate (Proxy :: Proxy x) ("subscriberPropagate: " <> description)
1335 subscriberPropagate subscribed m
1369 subscriberPropagate subscribed m
1336 , subscriberInvalidateHeight = \old -> do
1370 , subscriberInvalidateHeight = \old -> do
1337− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1371+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", old = " <> show (unHeight old)
1338 subscriberInvalidateHeight subscribed old
1372 subscriberInvalidateHeight subscribed old
1339− putStrLn $ "invalidateSubscriberHeight: " <> description <> ", done"
1373+ traceInvalidateHeight $ "invalidateSubscriberHeight: " <> description <> ", done"
1340 , subscriberRecalculateHeight = \new -> do
1374 , subscriberRecalculateHeight = \new -> do
1341− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1375+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", new = " <> show (unHeight new)
1342 subscriberRecalculateHeight subscribed new
1376 subscriberRecalculateHeight subscribed new
1343− putStrLn $ "subscriberRecalculateHeight: " <> description <> ", done"
1377+ traceInvalidateHeight $ "subscriberRecalculateHeight: " <> description <> ", done"
@@ -1354,11 +1388,15 @@ withIncreasedDepth _ a = do
1355{-# INLINE tracePropagate #-}
1389{-# INLINE tracePropagate #-}
1356tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1390tracePropagate :: (CanTrace x m) => proxy x -> String -> m ()
1357−tracePropagate p = trace p
1391+tracePropagate p = when debugPropagate . trace p
1359{-# INLINE traceInvalidate #-}
1393{-# INLINE traceInvalidate #-}
1360traceInvalidate :: String -> IO ()
1394traceInvalidate :: String -> IO ()
1361−traceInvalidate = liftIO . putStrLn
1395+traceInvalidate = when debugInvalidate . liftIO . debugStrLn
1397+{-# INLINE traceInvalidateHeight #-}
1398+traceInvalidateHeight :: String -> IO ()
1399+traceInvalidateHeight = when debugInvalidateHeight . liftIO . debugStrLn
1363{-# INLINE trace #-}
1401{-# INLINE trace #-}
1364trace :: (CanTrace x m) => proxy x -> String -> m ()
1402trace :: (CanTrace x m) => proxy x -> String -> m ()
@@ -1369,7 +1407,7 @@ traceM :: forall x proxy m. (CanTrace x m) => proxy x -> m String -> m ()
1369traceM _ getMessage = do
1407traceM _ getMessage = do
1370 message <- getMessage
1408 message <- getMessage
1371 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1409 d <- liftIO $ readIORef $ _spiderTimeline_depth $ unSTE (spiderTimeline :: SpiderTimelineEnv x)
1372− liftIO $ putStrLn $ replicate d ' ' <> message
1410+ liftIO $ debugStrLn $ replicate d ' ' <> message
@@ -1385,6 +1423,10 @@ tracePropagate _ _ = return ()
1385traceInvalidate :: String -> IO ()
1423traceInvalidate :: String -> IO ()
1386traceInvalidate _ = return ()
1424traceInvalidate _ = return ()
1426+{-# INLINE traceInvalidateHeight #-}
1427+traceInvalidateHeight :: String -> IO ()
1428+traceInvalidateHeight _ = return ()
1388{-# INLINE debugSubscriber #-}
1430{-# INLINE debugSubscriber #-}
1389debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1431debugSubscriber :: String -> Subscriber x a -> IO (Subscriber x a)
1390debugSubscriber _ = return
1432debugSubscriber _ = return
@@ -1425,8 +1467,11 @@ showStacks :: [[String]] -> String
1425showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1467showStacks = drawForest . listsToForest . fmap (filterStack "Reflex.Spider.Internal")
1427filterStack :: String -> [String] -> [String]
1469filterStack :: String -> [String] -> [String]
1470+#ifdef DEBUG_HIDE_INTERNALS
1428filterStack prefix = filter (not . (prefix `isPrefixOf`))
1471filterStack prefix = filter (not . (prefix `isPrefixOf`))
1473+filterStack prefix = id
1431#ifdef DEBUG_CYCLES
1476#ifdef DEBUG_CYCLES
@@ -1453,7 +1498,7 @@ instance Show EventLoopException where
1453{-# INLINE propagateSubscriberHold #-}
1498{-# INLINE propagateSubscriberHold #-}
1454propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1499propagateSubscriberHold :: forall x p. (HasSpiderTimeline x, Patch p) => Hold x p -> p -> EventM x ()
1455propagateSubscriberHold h a = do
1500propagateSubscriberHold h a = do
1456− traceM (Proxy :: Proxy x) $ liftIO $ do
1501+ {-# SCC "trace" #-} when debugPropagate $ traceM (Proxy :: Proxy x) $ liftIO $ do
1457 invalidators <- liftIO $ readIORef $ holdInvalidators h
1502 invalidators <- liftIO $ readIORef $ holdInvalidators h
1458 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
1503 return $ "SubscriberHold" <> showNodeId h <> ": " ++ show (length invalidators)
@@ -1461,7 +1506,7 @@ propagateSubscriberHold h a = do
1461 case {-# SCC "apply" #-} apply a v of
1506 case {-# SCC "apply" #-} apply a v of
1462 Nothing -> return ()
1507 Nothing -> return ()
1463 Just v' -> do
1508 Just v' -> do
1464− withIncreasedDepth (Proxy :: Proxy x) $
1509+ {-# SCC "trace2" #-} withIncreasedDepth (Proxy :: Proxy x) $
1465 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1510 tracePropagate (Proxy :: Proxy x) ("propagateSubscriberHold: assigning Hold" <> showNodeId h)
1466 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1511 vRef <- {-# SCC "vRef" #-} liftIO $ evaluate $ holdValue h
1467 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
1512 iRef <- {-# SCC "iRef" #-} liftIO $ evaluate $ holdInvalidators h
@@ -1993,7 +2038,7 @@ revalidateMergeHeight m = do
1993 LT -> return ()
2038 LT -> return ()
1994 EQ -> do
2039 EQ -> do
1995 let height = succHeight $ heightBagMax heights
2040 let height = succHeight $ heightBagMax heights
1996− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2041+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
1997 writeIORef (_merge_heightRef m) $! height
2042 writeIORef (_merge_heightRef m) $! height
1998 subscriberRecalculateHeight (_merge_sub m) height
2043 subscriberRecalculateHeight (_merge_sub m) height
1999 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
2044 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show (DMap.size parents) <> ") for Merge"
@@ -2157,7 +2202,7 @@ mergeIntCheap d = Event $ \sub -> do
2157 LT -> return ()
2202 LT -> return ()
2158 EQ -> do
2203 EQ -> do
2159 let height = succHeight $ heightBagMax heights
2204 let height = succHeight $ heightBagMax heights
2160− traceInvalidate $ "recalculateSubscriberHeight: height: " <> show height
2205+ traceInvalidateHeight $ "recalculateSubscriberHeight: height: " <> show height
2161 writeIORef heightRef $! height
2206 writeIORef heightRef $! height
2162 subscriberRecalculateHeight sub height
2207 subscriberRecalculateHeight sub height
2163 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
2208 GT -> error $ "revalidateMergeHeight: more heights (" <> show (heightBagSize heights) <> ") than parents (" <> show numParents <> ") for Merge"
@@ -2340,7 +2385,7 @@ runFrame a = SpiderHost $ do
2340 subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2385 subscription <- unSpiderHost $ runFrame $ {-# SCC "subscribeSwitch" #-} subscribe e sub --TODO: Assert that the event isn't firing --TODO: This should not loop because none of the events should be firing, but still, it is inefficient
2342 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2387 stackTrace <- liftIO $ fmap renderStack $ ccsToStrings =<< (getCCSOf $! switchSubscribedParent subscribed)
2343− liftIO $ putStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2388+ liftIO $ debugStrLn $ (++stackTrace) $ "subd' subscribed to " ++ case e of
2344 EventRoot _ -> "EventRoot"
2389 EventRoot _ -> "EventRoot"
2345 EventNever -> "EventNever"
2390 EventNever -> "EventNever"
2346 _ -> "something else"
2391 _ -> "something else"
@@ -2475,6 +2520,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Event
2475 {-# INLINABLE headE #-}
2520 {-# INLINABLE headE #-}
2476 headE = R.slowHeadE
2521 headE = R.slowHeadE
2477-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2522-- headE (SpiderEvent e) = SpiderEvent <$> Reflex.Spider.Internal.headE e
2523+ {-# INLINABLE now #-}
2524+ now = nowSpiderEventM
2479instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2526instance Reflex.Class.MonadSample (SpiderTimeline x) (SpiderPullM x) where
2480 {-# INLINABLE sample #-}
2527 {-# INLINABLE sample #-}
@@ -2496,6 +2543,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2496 {-# INLINABLE headE #-}
2543 {-# INLINABLE headE #-}
2497 headE = R.slowHeadE
2544 headE = R.slowHeadE
2498-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2545-- headE (SpiderEvent e) = SpiderPushM $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2546+ {-# INLINABLE now #-}
2547+ now = SpiderPushM nowSpiderEventM
2500instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2550instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x)) where
2501 {-# INLINE return #-}
2551 {-# INLINE return #-}
@@ -2504,8 +2554,10 @@ instance HasSpiderTimeline x => Monad (Reflex.Class.Dynamic (SpiderTimeline x))
2504 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2554 x >>= f = SpiderDynamic $ dynamicDynIdentity $ newJoinDyn $ newMapDyn (unSpiderDynamic . f) $ unSpiderDynamic x
2505 {-# INLINE (>>) #-}
2555 {-# INLINE (>>) #-}
2506 (>>) = (*>)
2556 (>>) = (*>)
2557+#if !MIN_VERSION_base(4,13,0)
2507 {-# INLINE fail #-}
2558 {-# INLINE fail #-}
2508 fail _ = error "Dynamic does not support 'fail'"
2559 fail _ = error "Dynamic does not support 'fail'"
2510{-# INLINABLE newJoinDyn #-}
2562{-# INLINABLE newJoinDyn #-}
2511newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
2563newJoinDyn :: HasSpiderTimeline x => DynamicS x (Identity (DynamicS x (Identity a))) -> Reflex.Spider.Internal.Dyn x (Identity a)
@@ -2557,6 +2609,9 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2557 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2609 buildDynamic getV0 e = runFrame . runSpiderHostFrame $ Reflex.Class.buildDynamic getV0 e
2558 {-# INLINABLE headE #-}
2610 {-# INLINABLE headE #-}
2559 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2611 headE e = runFrame . runSpiderHostFrame $ Reflex.Class.headE e
2612+ {-# INLINABLE now #-}
2613+ now = runFrame . runSpiderHostFrame $ Reflex.Class.now
2561instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2616instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHostFrame x) where
2562 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
2617 sample = SpiderHostFrame . readBehaviorUntracked . unSpiderBehavior --TODO: This can cause problems with laziness, so we should get rid of it if we can
@@ -2573,6 +2628,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Spide
2573 {-# INLINABLE headE #-}
2628 {-# INLINABLE headE #-}
2574 headE = R.slowHeadE
2629 headE = R.slowHeadE
2575-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2630-- headE (SpiderEvent e) = SpiderHostFrame $ SpiderEvent <$> Reflex.Spider.Internal.headE e
2631+ {-# INLINABLE now #-}
2632+ now = SpiderHostFrame Reflex.Class.now
2577instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2634instance HasSpiderTimeline x => Reflex.Class.MonadSample (SpiderTimeline x) (SpiderHost x) where
2578 {-# INLINABLE sample #-}
2635 {-# INLINABLE sample #-}
@@ -2593,6 +2650,8 @@ instance HasSpiderTimeline x => Reflex.Class.MonadHold (SpiderTimeline x) (Refle
2593 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2650 buildDynamic getV0 e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.buildDynamic getV0 e
2594 {-# INLINABLE headE #-}
2651 {-# INLINABLE headE #-}
2595 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2652 headE e = Reflex.Spider.Internal.ReadPhase $ Reflex.Class.headE e
2653+ {-# INLINABLE now #-}
2654+ now = Reflex.Spider.Internal.ReadPhase Reflex.Class.now
2597--------------------------------------------------------------------------------
2656--------------------------------------------------------------------------------
2598-- Deprecated items
2657-- Deprecated items
@@ -2716,7 +2775,7 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2716 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2775 fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2717 {-# INLINABLE mergeG #-}
2776 {-# INLINABLE mergeG #-}
2719− :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2778+ :: forall k2 (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2720 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2779 => (forall a. q a -> R.Event (SpiderTimeline x) (v a))
2721 -> DMap k q
2780 -> DMap k q
2722 -> R.Event (SpiderTimeline x) (DMap k v)
2781 -> R.Event (SpiderTimeline x) (DMap k v)
@@ -2784,8 +2843,14 @@ instance Monad (SpiderHost x) where
2784 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2843 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y
2785 {-# INLINABLE return #-}
2844 {-# INLINABLE return #-}
2786 return x = SpiderHost $ return x
2845 return x = SpiderHost $ return x
2846+#if !MIN_VERSION_base(4,13,0)
2847+ {-# INLINABLE fail #-}
2848+ fail = MonadFail.fail
2851+instance MonadFail (SpiderHost x) where
2787 {-# INLINABLE fail #-}
2852 {-# INLINABLE fail #-}
2788− fail s = SpiderHost $ fail s
2853+ fail s = SpiderHost $ MonadFail.fail s
2790-- | Run an action affecting the global Spider timeline; this will be guarded by
2855-- | Run an action affecting the global Spider timeline; this will be guarded by
2791-- a mutex for that timeline
2856-- a mutex for that timeline
@@ -2807,8 +2872,10 @@ instance Monad (SpiderHostFrame x) where
2807 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2872 SpiderHostFrame x >> SpiderHostFrame y = SpiderHostFrame $ x >> y
2808 {-# INLINABLE return #-}
2873 {-# INLINABLE return #-}
2809 return x = SpiderHostFrame $ return x
2874 return x = SpiderHostFrame $ return x
2875+#if !MIN_VERSION_base(4,13,0)
2810 {-# INLINABLE fail #-}
2876 {-# INLINABLE fail #-}
2811 fail s = SpiderHostFrame $ fail s
2877 fail s = SpiderHostFrame $ fail s
2813instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2880instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where
2814 notReadyUntil _ = pure ()
2881 notReadyUntil _ = pure ()