c97e132 · reflex · git.iko.soy

git.iko.soy/reflex

Merge pull request #117 from reflex-frp/fix-7-10

Fix 7.10 build

commitc97e132c901436ac2dc923eb02daf45eb46279d5 authorLuigy Leon <luichi.19@gmail.com> dateMon 12 Jun 2017, 22:32 (9 years ago) parent8f3c186 3a7b4c1

2 files changed+8−3

compare with develop

unifiedsplit

src/Data/Functor/Misc.hs+6−1 src/Reflex/EventWriter.hs+2−2

src/Data/Functor/Misc.hs+6−1

@@ -291,7 +291,12 @@ dsumToEither = \case

291291-- | We can't use @Compose Maybe@ instead of 'ComposeMaybe', because that would

292292-- make the 'f' parameter have a nominal type role. We need f to be

293293-- representational so that we can use safe 'coerce'.

294−newtype ComposeMaybe f a = ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)

294+#if MIN_VERSION_transformers(5,2,0)

295+newtype ComposeMaybe f a =

296+#else

297+newtype ComposeMaybe (f :: * -> *) (a :: *) =

298+#endif

299+ ComposeMaybe { getComposeMaybe :: Maybe (f a) } deriving (Show, Eq, Ord)

295300

296301deriving instance Functor f => Functor (ComposeMaybe f)

297302

src/Reflex/EventWriter.hs+2−2

@@ -77,7 +77,7 @@ instance MonadHold t m => MonadHold t (EventWriterT t w m) where

7777 holdDyn v0 = lift . holdDyn v0

7878 holdIncremental v0 = lift . holdIncremental v0

7979

80−instance (Reflex t, MonadAdjust t m, MonadHold t m, Semigroup w, Semigroup w) => MonadAdjust t (EventWriterT t w m) where

80+instance (Reflex t, MonadAdjust t m, MonadHold t m, Semigroup w) => MonadAdjust t (EventWriterT t w m) where

8181 runWithReplace = runWithReplaceEventWriterTWith $ \dm0 dm' -> lift $ runWithReplace dm0 dm'

8282 traverseDMapWithKeyWithAdjust = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjust f dm0 dm') mapPatchDMap weakenPatchDMapWith patchMapNewElements mergeMapIncremental

8383 traverseDMapWithKeyWithAdjustWithMove = sequenceDMapWithAdjustEventWriterTWith (\f dm0 dm' -> lift $ traverseDMapWithKeyWithAdjustWithMove f dm0 dm') mapPatchDMapWithMove weakenPatchDMapWithMoveWith patchMapWithMoveNewElements mergeMapIncrementalWithMove

@@ -108,7 +108,7 @@ runWithReplaceEventWriterTWith f a0 a' = do

108108 return (fst result0, fmapCheap fst result')

109109

110110-- | Like 'runWithReplaceEventWriterTWith', but for 'sequenceDMapWithAdjust'.

111−sequenceDMapWithAdjustEventWriterTWith :: forall t m p p' w k v v'. (Reflex t, MonadHold t m, Semigroup w, Semigroup w, Patch (p' (Some k) (Event t w)), PatchTarget (p' (Some k) (Event t w)) ~ Map (Some k) (Event t w))

111+sequenceDMapWithAdjustEventWriterTWith :: forall t m p p' w k v v'. (Reflex t, MonadHold t m, Semigroup w, Patch (p' (Some k) (Event t w)), PatchTarget (p' (Some k) (Event t w)) ~ Map (Some k) (Event t w))

112112 => ( (forall a. k a -> v a -> m (Compose ((,) (Seq (Event t w))) v' a))

113113 -> DMap k v

114114 -> Event t (p k v)