9ec0e5f · patch · git.iko.soy

reflex.cabal+1−1

compare with develop

unifiedsplit

@@ -61,7 +61,7 @@ library

61 semigroups >= 0.16 && < 0.19,

62 stm >= 2.4 && < 2.6,

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,

66 transformers >= 0.2,

67 transformers-compat >= 0.3,

src/Reflex/Class.hs+8

@@ -1018,9 +1018,17 @@ switchHoldPromptOnlyIncremental mergePatchIncremental coincidencePatch e0 e' = d

1018 That new -> new `applyAlways` mempty

1019 These old new -> new `applyAlways` old

1020

1021+#if MIN_VERSION_these(0, 8, 0)

1022+instance Reflex t => Semialign (Event t) where

1023+ align = alignEventWithMaybe Just

1024+

1021instance Reflex t => Align (Event t) where

1025instance Reflex t => Align (Event t) where

1022 nil = never

1026 nil = never

1027+#else

1028+instance Reflex t => Align (Event t) where

1023 align = alignEventWithMaybe Just

1029 align = alignEventWithMaybe Just

1030+ nil = never

1031+#endif

1024

1032

1025-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and

1033-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and

1026-- the 'Behavior' is true at the time of occurrence.

1034-- the 'Behavior' is true at the time of occurrence.

src/Reflex/Spider/Internal.hs+7

@@ -1131,9 +1131,16 @@ newInvalidatorPull p = return $! InvalidatorPull p

1131instance HasSpiderTimeline x => Filterable (Event x) where

1132 mapMaybe f = push $ return . f

1133

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

1134instance HasSpiderTimeline x => Align (Event x) where

1140instance HasSpiderTimeline x => Align (Event x) where

1135 nil = eventNever

1141 nil = eventNever

1136 align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]

1142 align ea eb = mapMaybe dmapToThese $ merge $ dynamicConst $ DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]

1143+#endif

1137

1144

1138data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)

1145data DynType x p = UnsafeDyn !(BehaviorM x (PatchTarget p), Event x p)

1139 | BuildDyn !(EventM x (PatchTarget p), Event x p)

1146 | BuildDyn !(EventM x (PatchTarget p), Event x p)