@@ -84,9 +84,9 @@ import Data.Zip (Zip (..))
8484
8585#ifdef DEBUG_CYCLES
8686import Control.Monad.State hiding (forM, forM_, mapM, mapM_, sequence)
87−import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
8887#endif
8988
89+import Data.List.NonEmpty (NonEmpty (..), nonEmpty)
9090import qualified Data.List.NonEmpty as NonEmpty
9191import Data.Tree (Forest, Tree (..), drawForest)
9292import Data.List (isPrefixOf)
@@ -166,6 +166,10 @@ showNodeId' = ("#"<>) . show
166166showNodeId :: a -> String
167167showNodeId _ = ""
168168
169+{-# INLINE showNodeId' #-}
170+showNodeId' :: Int -> String
171+showNodeId' _ = ""
172+
169173#endif
170174
171175#ifdef DEBUG_NODEIDS
@@ -298,39 +302,18 @@ cacheEvent e =
298302#endif
299303 subscribers <- liftIO FastWeakBag.empty
300304 occRef <- liftIO $ newIORef Nothing -- This should never be read prior to being set below
301−<<<<<<< HEAD
305+#ifdef DEBUG_NODEIDS
302306 (parentSub, occ) <- subscribeAndRead e $ debugSubscriber' ("cacheEvent" <> showNodeId' nodeId) $ Subscriber
307+#else
308+ (parentSub, occ) <- subscribeAndRead e $ Subscriber
309+#endif
303310 { subscriberPropagate = \a -> do
304− -- checkCycle (_eventSubscription_subscribed parentSub)
305311 liftIO $ writeIORef occRef (Just a)
306312 scheduleClear occRef
307313 propagateFast a subscribers
308− , subscriberInvalidateHeight = FastWeakBag.traverse subscribers . invalidateSubscriberHeight
309− , subscriberRecalculateHeight = FastWeakBag.traverse subscribers . recalculateSubscriberHeight
314+ , subscriberInvalidateHeight = FastWeakBag.traverse_ subscribers . invalidateSubscriberHeight
315+ , subscriberRecalculateHeight = FastWeakBag.traverse_ subscribers . recalculateSubscriberHeight
310316 }
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
321− }
322−=======
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
332− }
333−>>>>>>> develop
334317 when (isJust occ) $ do
335318 liftIO $ writeIORef occRef occ -- Set the initial value of occRef; we don't need to do this if occ is Nothing
336319 scheduleClear occRef