Merge pull request #360 from phadej/semialign-1.1

Support semialign-1.1

Author: ryantrinkle

reflex.cabal

@@ -78,7 +78,7 @@ library
 
   if flag(split-these)
     build-depends:     these >= 1 && <1.1,
-                       semialign >=1 && <1.1,
+                       semialign >=1 && <1.2,
                        monoidal-containers >= 0.6 && < 0.7
   else
     build-depends:     these >= 0.4 && <0.9,

src/Reflex/Class.hs

@@ -173,12 +173,15 @@ module Reflex.Class
   , slowHeadE
   ) where
 
-#if defined(MIN_VERSION_semialign)
+#ifdef MIN_VERSION_semialign
 import Prelude hiding (zip, zipWith)
 
 #if MIN_VERSION_these(0,8,0)
 import Data.These.Combinators (justThese)
 #endif
+#if MIN_VERSION_semialign(1,1,0)
+import Data.Zip (Zip (..))
+#endif
 #endif
 
 import Control.Applicative
@@ -1077,7 +1080,10 @@ instance Reflex t => Semialign (Event t) where
 #endif
   align = alignEventWithMaybe Just
 
-#if defined(MIN_VERSION_semialign)
+#ifdef MIN_VERSION_semialign
+#if MIN_VERSION_semialign(1,1,0)
+instance Reflex t => Zip (Event t) where
+#endif
   zip x y = mapMaybe justThese $ align x y
 #endif
 

src/Reflex/Collection.hs

@@ -27,8 +27,11 @@ module Reflex.Collection
   , simpleList
   ) where
 
-#if defined(MIN_VERSION_semialign)
+#ifdef MIN_VERSION_semialign
 import Prelude hiding (zip, zipWith)
+#if MIN_VERSION_semialign(1,1,0)
+import Data.Zip (Zip (..))
+#endif
 #endif
 
 import Control.Monad.Identity

src/Reflex/Spider/Internal.hs

@@ -72,10 +72,13 @@ import System.IO.Unsafe
 import System.Mem.Weak
 import Unsafe.Coerce
 
-#if defined(MIN_VERSION_semialign)
+#ifdef MIN_VERSION_semialign
 #if MIN_VERSION_these(0,8,0)
 import Data.These.Combinators (justThese)
 #endif
+#if MIN_VERSION_semialign(1,1,0)
+import Data.Zip (Zip (..))
+#endif
 #endif
 
 #ifdef DEBUG_CYCLES
@@ -1163,7 +1166,10 @@ instance HasSpiderTimeline x => Semialign (Event x) where
   align ea eb = mapMaybe dmapToThese $ mergeG coerce $ dynamicConst $
      DMap.fromDistinctAscList [LeftTag :=> ea, RightTag :=> eb]
 
-#if defined(MIN_VERSION_semialign)
+#ifdef MIN_VERSION_semialign
+#if MIN_VERSION_semialign(1,1,0)
+instance HasSpiderTimeline x => Zip (Event x) where
+#endif
   zip x y = mapMaybe justThese $ align x y
 #endif