de9d2b0 · patch · git.iko.soy

reflex.cabal+1−1

compare with develop

unifiedsplit

@@ -78,7 +78,7 @@ library

78

79 if flag(split-these)

80 build-depends: these >= 1 && <1.1,

81− semialign >=1 && <1.1,

81+ semialign >=1 && <1.2,

82 monoidal-containers >= 0.6 && < 0.7

83 else

84 build-depends: these >= 0.4 && <0.9,

src/Reflex/Class.hs+8−2

@@ -173,12 +173,15 @@ module Reflex.Class

173 , slowHeadE

174 ) where

175

176−#if defined(MIN_VERSION_semialign)

176+#ifdef MIN_VERSION_semialign

177import Prelude hiding (zip, zipWith)

178

179#if MIN_VERSION_these(0,8,0)

180import Data.These.Combinators (justThese)

181#endif

182+#if MIN_VERSION_semialign(1,1,0)

183+import Data.Zip (Zip (..))

184+#endif

182#endif

185#endif

183

186

184import Control.Applicative

187import Control.Applicative

@@ -1077,7 +1080,10 @@ instance Reflex t => Semialign (Event t) where

1077#endif

1080#endif

1078 align = alignEventWithMaybe Just

1081 align = alignEventWithMaybe Just

1079

1082

1080−#if defined(MIN_VERSION_semialign)

1083+#ifdef MIN_VERSION_semialign

1084+#if MIN_VERSION_semialign(1,1,0)

1085+instance Reflex t => Zip (Event t) where

1086+#endif

1081 zip x y = mapMaybe justThese $ align x y

1087 zip x y = mapMaybe justThese $ align x y

1082#endif

1088#endif

1083

1089

src/Reflex/Collection.hs+4−1

@@ -27,8 +27,11 @@ module Reflex.Collection

27 , simpleList

28 ) where

29

30−#if defined(MIN_VERSION_semialign)

30+#ifdef MIN_VERSION_semialign

31import Prelude hiding (zip, zipWith)

32+#if MIN_VERSION_semialign(1,1,0)

33+import Data.Zip (Zip (..))

34+#endif

32#endif

35#endif

33

36

34import Control.Monad.Identity

37import Control.Monad.Identity

src/Reflex/Spider/Internal.hs+8−2

@@ -72,10 +72,13 @@ import System.IO.Unsafe

72import System.Mem.Weak

73import Unsafe.Coerce

74

75−#if defined(MIN_VERSION_semialign)

75+#ifdef MIN_VERSION_semialign

76#if MIN_VERSION_these(0,8,0)

77import Data.These.Combinators (justThese)

78#endif

79+#if MIN_VERSION_semialign(1,1,0)

80+import Data.Zip (Zip (..))

81+#endif

79#endif

82#endif

80

83

81#ifdef DEBUG_CYCLES

84#ifdef DEBUG_CYCLES

@@ -1163,7 +1166,10 @@ instance HasSpiderTimeline x => Semialign (Event x) where

1163 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $

1166 align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $

1164 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]

1167 DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]

1165

1168

1166−#if defined(MIN_VERSION_semialign)

1169+#ifdef MIN_VERSION_semialign

1170+#if MIN_VERSION_semialign(1,1,0)

1171+instance HasSpiderTimeline x => Zip (Event x) where

1172+#endif

1167 zip x y = mapMaybe justThese $ align x y

1173 zip x y = mapMaybe justThese $ align x y

1168#endif

1174#endif

1169

1175