3ad548b · reflex · git.iko.soy

git.iko.soy/reflex

Merge pull request #303 from alexfmpe/these-0.8

Bump 'these' upper bound

commit3ad548b7575560010a1c23721f4f4b1da7634a65 authorRyan Trinkle <ryan.trinkle@gmail.com> dateSun 21 Apr 2019, 17:30 (7 years ago) parent163c414 e6d8714

3 files changed+8−1

compare with develop

unifiedsplit

reflex.cabal+1−1 src/Reflex/Class.hs+4 src/Reflex/Spider/Internal.hs+3

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+4

@@ -1020,8 +1020,12 @@ switchHoldPromptOnlyIncremental mergePatchIncremental coincidencePatch e0 e' = d

10201020

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

10221022 nil = never

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

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

1025+#endif

10231026 align = alignEventWithMaybe Just

10241027

1028+

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

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

10271031gate :: 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

11331133

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

11351135 nil = eventNever

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

1137+instance HasSpiderTimeline x => Semialign (Event x) where

1138+#endif

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

11371140

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