git.iko.soy/reflex
on develop help sign in
Bump 'these' upper bound
commit9ec0e5f18f3439715eca042242ad54aeb17145d6 authorAlexandre Esteves <alexandre.fmp.esteves@gmail.com> dateThu 18 Apr 2019, 01:20 (7 years ago) parent163c414
3 files changed+16−1
compare with develop
unifiedsplit
reflex.cabal+1−1 src/Reflex/Class.hs+8 src/Reflex/Spider/Internal.hs+7
reflex.cabal+1−1
@@ -61,7 +61,7 @@ library
6161 semigroups >= 0.16 && < 0.19,
6262 stm >= 2.4 && < 2.6,
6363 syb >= 0.5 && < 0.8,
64− these >= 0.4 && < 0.7.7,
64+ these >= 0.4 && < 0.9,
6565 time >= 1.4 && < 1.9,
6666 transformers >= 0.2,
6767 transformers-compat >= 0.3,
src/Reflex/Class.hs+8
@@ -1018,9 +1018,17 @@ switchHoldPromptOnlyIncremental mergePatchIncremental coincidencePatch e0 e' = d
10181018 That new -> new `applyAlways` mempty
10191019 These old new -> new `applyAlways` old
10201020
1021+#if MIN_VERSION_these(0, 8, 0)
1022+instance Reflex t => Semialign (Event t) where
1023+ align = alignEventWithMaybe Just
1024+
10211025instance Reflex t => Align (Event t) where
10221026 nil = never
1027+#else
1028+instance Reflex t => Align (Event t) where
10231029 align = alignEventWithMaybe Just
1030+ nil = never
1031+#endif
10241032
10251033-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and
10261034-- the 'Behavior' is true at the time of occurrence.
src/Reflex/Spider/Internal.hs+7
@@ -1131,9 +1131,16 @@ newInvalidatorPull p = return $! InvalidatorPull p
11311131instance HasSpiderTimeline x => Filterable (Event x) where
11321132 mapMaybe f = push $ return . f
11331133
1134+#if MIN_VERSION_these(0, 8, 0)
1135+instance HasSpiderTimeline x => Semialign (Event x) where
1136+ align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1137+instance HasSpiderTimeline x => Align (Event x) where
1138+ nil = eventNever
1139+#else
11341140instance HasSpiderTimeline x => Align (Event x) where
11351141 nil = eventNever
11361142 align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1143+#endif
11371144
11381145data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
11391146 | BuildDyn !(EventM x (PatchTarget p), Event x p)