on develop help sign in
Merge pull request #303 from alexfmpe/these-0.8
3ad548bRyan Trinkle
reflex.cabal+1−1
@@ -61,7 +61,7 @@ library
61 semigroups >= 0.16 && < 0.19,
61 semigroups >= 0.16 && < 0.19,
62 stm >= 2.4 && < 2.6,
62 stm >= 2.4 && < 2.6,
63 syb >= 0.5 && < 0.8,
63 syb >= 0.5 && < 0.8,
64− these >= 0.4 && < 0.7.7,
64+ these >= 0.4 && < 0.9,
65 time >= 1.4 && < 1.9,
65 time >= 1.4 && < 1.9,
66 transformers >= 0.2,
66 transformers >= 0.2,
67 transformers-compat >= 0.3,
67 transformers-compat >= 0.3,
src/Reflex/Class.hs+4
@@ -1020,8 +1020,12 @@ switchHoldPromptOnlyIncremental mergePatchIncremental coincidencePatch e0 e' = d
1020
1020
1021instance Reflex t => Align (Event t) where
1021instance Reflex t => Align (Event t) where
1022 nil = never
1022 nil = never
1023+#if MIN_VERSION_these(0, 8, 0)
1024+instance Reflex t => Semialign (Event t) where
1025+#endif
1023 align = alignEventWithMaybe Just
1026 align = alignEventWithMaybe Just
1024
1027
1028+
1025-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and
1029-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and
1026-- the 'Behavior' is true at the time of occurrence.
1030-- the 'Behavior' is true at the time of occurrence.
1027gate :: Reflex t => Behavior t Bool -> Event t a -> Event t a
1031gate :: Reflex t => Behavior t Bool -> Event t a -> Event t a
src/Reflex/Spider/Internal.hs+3
@@ -1133,6 +1133,9 @@ instance HasSpiderTimeline x => Filterable (Event x) where
1133
1133
1134instance HasSpiderTimeline x => Align (Event x) where
1134instance HasSpiderTimeline x => Align (Event x) where
1135 nil = eventNever
1135 nil = eventNever
1136+#if MIN_VERSION_these(0, 8, 0)
1137+instance HasSpiderTimeline x => Semialign (Event x) where
1138+#endif
1136 align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1139 align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
1137
1140
1138data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)
1141data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)