@@ -20,7 +20,6 @@
20{-# LANGUAGE DeriveFunctor #-}
20{-# LANGUAGE DeriveFunctor #-}
21{-# LANGUAGE StandaloneDeriving #-}
21{-# LANGUAGE StandaloneDeriving #-}
22{-# LANGUAGE InstanceSigs #-}
22{-# LANGUAGE InstanceSigs #-}
24#ifdef USE_REFLEX_OPTIMIZER
23#ifdef USE_REFLEX_OPTIMIZER
25{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
24{-# OPTIONS_GHC -fplugin=Reflex.Optimizer #-}
@@ -388,7 +387,7 @@ eventRoot !k !r = Event $ wrap eventSubscribedRoot $ liftIO . getRootSubscribed
388eventNever :: Event x a
387eventNever :: Event x a
389eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
388eventNever = Event $ \_ -> return (EventSubscription (return ()) eventSubscribedNever, Nothing)
391−eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k v -> Event x (v a)
390+eventFan :: (GCompare k, HasSpiderTimeline x) => k a -> Fan x k -> Event x a
392eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
391eventFan !k !f = Event $ wrap eventSubscribedFan $ getFanSubscribed k f
394eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
393eventSwitch :: HasSpiderTimeline x => Switch x a -> Event x a
@@ -440,14 +439,14 @@ newSubscriberHold h = return $ Subscriber
440 , subscriberRecalculateHeight = \_ -> return ()
439 , subscriberRecalculateHeight = \_ -> return ()
443−newSubscriberFan :: forall x k v. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k v -> IO (Subscriber x (DMap k v))
442+newSubscriberFan :: forall x k. (HasSpiderTimeline x, GCompare k) => FanSubscribed x k -> IO (Subscriber x (DMap k Identity))
444newSubscriberFan subscribed = return $ Subscriber
443newSubscriberFan subscribed = return $ Subscriber
445 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
444 { subscriberPropagate = \a -> {-# SCC "traverseFan" #-} do
446 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
445 subs <- liftIO $ readIORef $ fanSubscribedSubscribers subscribed
447 tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
446 tracePropagate (Proxy :: Proxy x) $ "SubscriberFan" <> showNodeId subscribed <> ": " ++ show (DMap.size subs) ++ " keys subscribed, " ++ show (DMap.size a) ++ " keys firing"
448 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
447 liftIO $ writeIORef (fanSubscribedOccurrence subscribed) $ Just a
449 scheduleClear $ fanSubscribedOccurrence subscribed
448 scheduleClear $ fanSubscribedOccurrence subscribed
450− let f _ (Pair v subsubs) = do
449+ let f _ (Pair (Identity v) subsubs) = do
451 propagate v $ _fanSubscribedChildren_list subsubs
450 propagate v $ _fanSubscribedChildren_list subsubs
452 return $ Constant ()
451 return $ Constant ()
453 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
452 _ <- DMap.traverseWithKey f $ DMap.intersectionWithKey (\_ -> Pair) a subs --TODO: Would be nice to have DMap.traverse_
@@ -600,7 +599,7 @@ eventSubscribedNever = EventSubscribed
603−eventSubscribedFan :: FanSubscribed x k v -> EventSubscribed x
602+eventSubscribedFan :: FanSubscribed x k -> EventSubscribed x
604eventSubscribedFan !subscribed = EventSubscribed
603eventSubscribedFan !subscribed = EventSubscribed
605 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
604 { eventSubscribedHeightRef = eventSubscribedHeightRef $ _eventSubscription_subscribed $ fanSubscribedParent subscribed
606 , eventSubscribedRetained = toAny subscribed
605 , eventSubscribedRetained = toAny subscribed
@@ -1018,7 +1017,7 @@ data RootSubscribed x a = forall k. GCompare k => RootSubscribed
1021−data Root x k
1020+data Root x (k :: * -> *)
1022 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1021 = Root { rootOccurrence :: !(IORef (DMap k Identity)) -- The currently-firing occurrence of this event
1023 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1022 , rootSubscribed :: !(IORef (DMap k (RootSubscribed x)))
1024 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
1023 , rootInit :: !(forall a. k a -> RootTrigger x a -> IO (IO ()))
@@ -1088,25 +1087,25 @@ heightBagVerify b@(HeightBag s c) = if
1088heightBagVerify = id
1087heightBagVerify = id
1091−data FanSubscribedChildren x k v a = FanSubscribedChildren
1090+data FanSubscribedChildren (x :: *) k a = FanSubscribedChildren
1092− { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x (v a)))
1091+ { _fanSubscribedChildren_list :: !(WeakBag (Subscriber x a))
1093− , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k v)
1092+ , _fanSubscribedChildren_self :: {-# NOUNPACK #-} !(k a, FanSubscribed x k)
1094− , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k v)))
1093+ , _fanSubscribedChildren_weakSelf :: !(IORef (Weak (k a, FanSubscribed x k)))
1097−data FanSubscribed x k v
1096+data FanSubscribed (x :: *) k
1098− = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1097+ = FanSubscribed { fanSubscribedCachedSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1099− , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k v)))
1098+ , fanSubscribedOccurrence :: !(IORef (Maybe (DMap k Identity)))
1100− , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k v))) -- This DMap should never be empty
1099+ , fanSubscribedSubscribers :: !(IORef (DMap k (FanSubscribedChildren x k))) -- This DMap should never be empty
1101 , fanSubscribedParent :: !(EventSubscription x)
1100 , fanSubscribedParent :: !(EventSubscription x)
1102#ifdef DEBUG_NODEIDS
1101#ifdef DEBUG_NODEIDS
1103 , fanSubscribedNodeId :: Int
1102 , fanSubscribedNodeId :: Int
1107−data Fan x k v
1106+data Fan x k
1108− = Fan { fanParent :: !(Event x (DMap k v))
1107+ = Fan { fanParent :: !(Event x (DMap k Identity))
1109− , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k v)))
1108+ , fanSubscribed :: !(IORef (Maybe (FanSubscribed x k)))
1112data SwitchSubscribed x a
1111data SwitchSubscribed x a
@@ -1560,7 +1559,7 @@ fanInt p =
1560 return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
1559 return (EventSubscription (FastWeakBag.remove t) $! EventSubscribed heightRef $! toAny (_fanInt_subscriptionRef self, t), IntMap.lookup k currentOcc)
1562{-# INLINABLE getFanSubscribed #-}
1561{-# INLINABLE getFanSubscribed #-}
1563−getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k v -> Subscriber x (v a) -> EventM x (WeakBagTicket, FanSubscribed x k v, Maybe (v a))
1562+getFanSubscribed :: (HasSpiderTimeline x, GCompare k) => k a -> Fan x k -> Subscriber x a -> EventM x (WeakBagTicket, FanSubscribed x k, Maybe a)
1564getFanSubscribed k f sub = do
1563getFanSubscribed k f sub = do
1565 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1564 mSubscribed <- liftIO $ readIORef $ fanSubscribed f
1566 case mSubscribed of
1565 case mSubscribed of
@@ -1594,7 +1593,7 @@ getFanSubscribed k f sub = do
1594 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1593 liftIO $ writeIORef (fanSubscribed f) $ Just subscribed
1595 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1594 return (slnForSub, subscribed, coerce $ DMap.lookup k =<< parentOcc)
1597−cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k v) -> IO ()
1596+cleanupFanSubscribed :: GCompare k => (k a, FanSubscribed x k) -> IO ()
1598cleanupFanSubscribed (k, subscribed) = do
1597cleanupFanSubscribed (k, subscribed) = do
1599 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1598 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1600 let reducedSubscribers = DMap.delete k subscribers
1599 let reducedSubscribers = DMap.delete k subscribers
@@ -1606,7 +1605,7 @@ cleanupFanSubscribed (k, subscribed) = do
1606 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1605 else writeIORef (fanSubscribedSubscribers subscribed) $! reducedSubscribers
1608{-# INLINE subscribeFanSubscribed #-}
1607{-# INLINE subscribeFanSubscribed #-}
1609−subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k v -> Subscriber x (v a) -> IO WeakBagTicket
1608+subscribeFanSubscribed :: GCompare k => k a -> FanSubscribed x k -> Subscriber x a -> IO WeakBagTicket
1610subscribeFanSubscribed k subscribed sub = do
1609subscribeFanSubscribed k subscribed sub = do
1611 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1610 subscribers <- readIORef $ fanSubscribedSubscribers subscribed
1612 case DMap.lookup k subscribers of
1611 case DMap.lookup k subscribers of
@@ -2082,15 +2081,14 @@ mergeIntCheap d = Event $ \sub -> do
2084newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2083newtype EventSelector x k = EventSelector { select :: forall a. k a -> Event x a }
2085−newtype EventSelectorG x k v = EventSelectorG { selectG :: forall a. k a -> Event x (v a) }
2087−fanG :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k v) -> EventSelectorG x k v
2085+fan :: (HasSpiderTimeline x, GCompare k) => Event x (DMap k Identity) -> EventSelector x k
2088−fanG e =
2086+fan e =
2089 let f = Fan
2087 let f = Fan
2090 { fanParent = e
2088 { fanParent = e
2091 , fanSubscribed = unsafeNewIORef e Nothing
2089 , fanSubscribed = unsafeNewIORef e Nothing
2093− in EventSelectorG $ \k -> eventFan k f
2091+ in EventSelector $ \k -> eventFan k f
2095runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2093runHoldInits :: HasSpiderTimeline x => IORef [SomeHoldInit x] -> IORef [SomeDynInit x] -> IORef [SomeMergeInit x] -> EventM x ()
2096runHoldInits holdInitRef dynInitRef mergeInitRef = do
2094runHoldInits holdInitRef dynInitRef mergeInitRef = do
@@ -2559,8 +2557,6 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2559 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2557 pushCheap f = SpiderEvent . pushCheap (coerce f) . unSpiderEvent
2560 {-# INLINABLE pull #-}
2558 {-# INLINABLE pull #-}
2561 pull = SpiderBehavior . pull . coerce
2559 pull = SpiderBehavior . pull . coerce
2562− {-# INLINABLE fanG #-}
2563− fanG e = R.EventSelectorG $ SpiderEvent . selectG (fanG (unSpiderEvent e))
2564 {-# INLINABLE mergeG #-}
2560 {-# INLINABLE mergeG #-}
2566 :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
2562 :: forall (k :: k2 -> *) q (v :: k2 -> *). GCompare k
@@ -2568,6 +2564,8 @@ instance HasSpiderTimeline x => R.Reflex (SpiderTimeline x) where
2568 -> DMap k q
2564 -> DMap k q
2569 -> R.Event (SpiderTimeline x) (DMap k v)
2565 -> R.Event (SpiderTimeline x) (DMap k v)
2570 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2566 mergeG nt = SpiderEvent . mergeG (unSpiderEvent #. nt) . dynamicConst
2567+ {-# INLINABLE fan #-}
2568+ fan e = R.EventSelector $ SpiderEvent . select (fan (unSpiderEvent e))
2571 {-# INLINABLE switch #-}
2569 {-# INLINABLE switch #-}
2572 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2570 switch = SpiderEvent . switch . (coerce :: Behavior x (R.Event (SpiderTimeline x) a) -> Behavior x (Event x a)) . unSpiderBehavior
2573 {-# INLINABLE coincidence #-}
2571 {-# INLINABLE coincidence #-}