Ticket #14: reactive-snapshot-patches.bundle

Tue Dec  2 21:51:33 GMT 2008  Richard Smith <richard-reactive@metafoo.co.uk>
  * Make Data.AddBounds' Ord instance require less information.

Tue Dec  2 22:00:53 GMT 2008  Richard Smith <richard-reactive@metafoo.co.uk>
  * Need TypeCompose 0.6.3 for Data.Zip.zipWith

Tue Dec  2 22:01:26 GMT 2008  Richard Smith <richard-reactive@metafoo.co.uk>
  * Fix blocking and resulting space leak in snapshot.

New patches:

[Make Data.AddBounds' Ord instance require less information.
Richard Smith <richard-reactive@metafoo.co.uk>**20081202215133] {
hunk ./src/Data/AddBounds.hs 17
+import Data.Unamb (unamb)
hunk ./src/Data/AddBounds.hs 45
+--
+--   MaxBound `max` undefined can return full information while the default
+--   implementation cannot. And likewise undefined `max` MaxBound.
hunk ./src/Data/AddBounds.hs 50
-  MinBound  <= _         = True
-  NoBound _ <= MinBound  = False
-  NoBound a <= NoBound b = a <= b
-  NoBound _ <= MaxBound  = True
-  MaxBound  <= MaxBound  = True
-  MaxBound  <= _         = False        -- given previous 
+  a <= b = c1 a b `unamb` c2 a b
+    where c1 MinBound     _            = True
+          c1 _            MinBound     = False
+          c1 (NoBound a') (NoBound b') = a' < b'
+          c1 MaxBound     (NoBound _)  = False
+          c1 _            _            = undefined
+          c2 _            MaxBound     = True
+          c2 _            _            = undefined
hunk ./src/Data/AddBounds.hs 59
-  MinBound  `min` _         = MinBound
-  _         `min` MinBound  = MinBound
-  NoBound a `min` NoBound b = NoBound (a `min` b)
-  u         `min` MaxBound  = u
-  MaxBound  `min` v         = v
-  
-  MinBound  `max` v         = v
-  u         `max` MinBound  = u
-  NoBound a `max` NoBound b = NoBound (a `max` b)
-  _         `max` MaxBound  = MaxBound
-  MaxBound  `max` _         = MaxBound
+  a `min` b = c1 a b `unamb` c2 a b
+    where c1 MinBound     _            = MinBound
+          c1 (NoBound a') (NoBound b') = NoBound $ a' `max` b'
+          c1 (NoBound _)  MaxBound     = a
+          c1 MaxBound     (NoBound _)  = b
+          c1 MaxBound     MaxBound     = MaxBound
+          c1 _            _            = undefined
+          c2 _            MinBound     = MinBound
+          c2 _            _            = undefined
+
+  a `max` b = c1 a b `unamb` c2 a b
+    where c1 MaxBound     _            = MaxBound
+          c1 (NoBound a') (NoBound b') = NoBound $ a' `max` b'
+          c1 (NoBound _)  MinBound     = a
+          c1 MinBound     (NoBound _)  = b
+          c1 MinBound     MinBound     = MinBound
+          c1 _            _            = undefined
+          c2 _            MaxBound     = MaxBound
+          c2 _            _            = undefined
}

[Need TypeCompose 0.6.3 for Data.Zip.zipWith
Richard Smith <richard-reactive@metafoo.co.uk>**20081202220053] hunk ./reactive.cabal 35
-                         TypeCompose>=0.6.0, vector-space>=0.5,
+                         TypeCompose>=0.6.3, vector-space>=0.5,

[Fix blocking and resulting space leak in snapshot.
Richard Smith <richard-reactive@metafoo.co.uk>**20081202220126] {
hunk ./src/FRP/Reactive/PrimReactive.hs 438
--- This variant of 'snapshot' has 'Nothing's where @b@ changed and @a@
--- didn't.
-snap :: forall a b t. Ord t =>
-        EventG t a -> ReactiveG t b -> EventG t (Maybe a, b)
-Event (Future (Max MaxBound, _)) `snap` _ = mempty
-ea `snap` (b0 `Stepper` eb) =
-  (Nothing, b0) `accumE` (fmap fa ea `mappend` fmap fb eb)
- where
-   fa :: a -> Unop (Maybe a, b)
-   fb :: b -> Unop (Maybe a, b)
-   fa a (_,b) = (Just a , b)
-   fb b _     = (Nothing, b)
-
hunk ./src/FRP/Reactive/PrimReactive.hs 442
-snapshotWith f e r = joinMaybes $ fmap h (e `snap` r)
+snapshotWith f (Event (Future (t, ~(v `Stepper` es)))) r =
+  (Event (Future (t `max` t', f v w `Stepper` es')))
hunk ./src/FRP/Reactive/PrimReactive.hs 445
-   h (Nothing,_) = Nothing
-   h (Just a ,b) = Just (f a b)
+   (t', r'@(w `Stepper` _)) = skipToR t r
+   es' = snapshotWith f es r'
+
+-- | Find the last event before a given time.
+skipToR :: Ord t => Time t -> ReactiveG t b -> (Time t, ReactiveG t b)
+skipToR t r@(_ `Stepper` Event (Future (t', r')))
+  | t' <= t   = let (t'', r'') = skipToR t r' in (t' `max` t'', r'')
+  | otherwise = (t, r)
+
}

Context:

[Fun Zip; Richard Smith's (lilac's) snap mempty fix
Conal Elliott <conal@conal.net>**20081130204649] 
[TAG 0.9.6
Conal Elliott <conal@conal.net>**20081128183303] 
[releasing version 0.9.6
Conal Elliott <conal@conal.net>**20081128183241
 Fixes some doc bugs blocking haddock
] 
[TAG 0.9.5
Conal Elliott <conal@conal.net>**20081128053142] 
[0.9.5
Conal Elliott <conal@conal.net>**20081128053126] 
[generalized behavior ops; completed Num-inc
Conal Elliott <conal@conal.net>**20081128053112] 
[TAG 0.9.4
Conal Elliott <conal@conal.net>**20081127232536] 
Patch bundle hash:
bcde129b3ab4981d2912b24e0f204a9bc0832659