4c2f164 · patch · git.iko.soy

git.iko.soy/patch

on develop help sign in

Define MonadFail before 8.8.

4c2f164John Ericson7 years ago

src/Reflex/Spider/Internal.hs+16−5

compare with develop

unifiedsplit

@@ -43,6 +43,7 @@ import Control.Monad.Reader.Class

43import Control.Monad.IO.Class

44import Control.Monad.ReaderIO

45import Control.Monad.Ref

46+import qualified Control.Monad.Fail as MonadFail

46import Data.Align

47import Data.Align

47import Data.Coerce

48import Data.Coerce

48import Data.Dependent.Map (DMap, DSum (..))

49import Data.Dependent.Map (DMap, DSum (..))

@@ -974,9 +975,13 @@ instance Monad (BehaviorM x) where

974 return x = BehaviorM $ return x

975 return x = BehaviorM $ return x

975#if !MIN_VERSION_base(4,13,0)

976#if !MIN_VERSION_base(4,13,0)

976 {-# INLINE fail #-}

977 {-# INLINE fail #-}

977− fail s = BehaviorM $ fail s

978+ fail s = MonadFail.fail

978#endif

979#endif

979

980

981+instance MonadFail (SpiderHost x) where

982+ {-# INLINABLE fail #-}

983+ fail s = BehaviorM $ fail s

984+

980data BehaviorSubscribed x a

985data BehaviorSubscribed x a

981 = forall p. BehaviorSubscribedHold (Hold x p)

986 = forall p. BehaviorSubscribedHold (Hold x p)

982 | BehaviorSubscribedPull (PullSubscribed x a)

987 | BehaviorSubscribedPull (PullSubscribed x a)

@@ -2641,10 +2646,12 @@ instance Monad (SpiderHost x) where

2641 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y

2646 SpiderHost x >> SpiderHost y = SpiderHost $ x >> y

2642 {-# INLINABLE return #-}

2647 {-# INLINABLE return #-}

2643 return x = SpiderHost $ return x

2648 return x = SpiderHost $ return x

2644−#if MIN_VERSION_base(4,13,0)

2649+#if !MIN_VERSION_base(4,13,0)

2650+ {-# INLINABLE fail #-}

2651+ fail s = MonadFail.fail

2652+#endif

2645

2653

2646instance MonadFail (SpiderHost x) where

2654instance MonadFail (SpiderHost x) where

2647−#endif

2648 {-# INLINABLE fail #-}

2655 {-# INLINABLE fail #-}

2649 fail s = SpiderHost $ fail s

2656 fail s = SpiderHost $ fail s

2650

2657

@@ -2670,9 +2677,13 @@ instance Monad (SpiderHostFrame x) where

2670 return x = SpiderHostFrame $ return x

2677 return x = SpiderHostFrame $ return x

2671#if !MIN_VERSION_base(4,13,0)

2678#if !MIN_VERSION_base(4,13,0)

2672 {-# INLINABLE fail #-}

2679 {-# INLINABLE fail #-}

2673− fail s = SpiderHostFrame $ fail s

2680+ fail s = MonadFail.fail

2674#endif

2681#endif

2675

2682

2683+instance MonadFail (SpiderHostFrame x) where

2684+ {-# INLINABLE fail #-}

2685+ fail s = SpiderHostFrame $ fail s

2686+

2676instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where

2687instance NotReady (SpiderTimeline x) (SpiderHostFrame x) where

2677 notReadyUntil _ = pure ()

2688 notReadyUntil _ = pure ()

2678 notReady = pure ()

2689 notReady = pure ()

@@ -2723,4 +2734,4 @@ instance NotReady (SpiderTimeline x) (SpiderHost x) where

2723

2734

2724instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where

2735instance HasSpiderTimeline x => NotReady (SpiderTimeline x) (PerformEventT (SpiderTimeline x) (SpiderHost x)) where

2725 notReadyUntil _ = return ()

2736 notReadyUntil _ = return ()

2726− notReady = return ()

2737+ notReady = return ()