bb39b6e · reflex · git.iko.soy

src/Data/Map/Misc.hs+1−1

compare with develop

unifiedsplit

@@ -10,7 +10,7 @@ module Data.Map.Misc

10 ) where

11

12import Data.Align

13−import Data.Either

13+import Data.Either (isLeft)

14import Data.Map (Map)

15import qualified Data.Map as Map

16import Data.Maybe

src/Data/WeakBag.hs−2

@@ -72,8 +72,6 @@ insert a (WeakBag nextId children) wbRef finalizer = {-# SCC "insert" #-} do

72 let !csWithoutMe = IntMap.delete myId cs

73 in (csWithoutMe, csWithoutMe)

74 when (IntMap.null csWithoutMe) $ finalizer b

75− return ()

76− return ()

77 wa <- mkWeakPtr a' $ Just cleanup

75 wa <- mkWeakPtr a' $ Just cleanup

78 atomicModifyIORef' children $ \cs -> (IntMap.insert myId wa cs, ())

76 atomicModifyIORef' children $ \cs -> (IntMap.insert myId wa cs, ())

79 return $ WeakBagTicket

77 return $ WeakBagTicket

src/Reflex/Adjustable/Class.hs+2−2

@@ -18,8 +18,8 @@ module Reflex.Adjustable.Class

18 , mapMapWithAdjustWithMove

19 ) where

20

21−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

21+import Control.Monad.Identity

22−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

22+import Control.Monad.Reader

23import Data.Align

24import Data.Dependent.Map (DMap, GCompare (..))

25import Data.Functor.Constant

src/Reflex/Class.hs+4−12

@@ -147,9 +147,9 @@ module Reflex.Class

147 ) where

148

149import Control.Applicative

150−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

150+import Control.Monad.Identity

151−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

151+import Control.Monad.Reader

152−import Control.Monad.State.Strict hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

152+import Control.Monad.State.Strict

153import Control.Monad.Trans.Cont (ContT)

154import Control.Monad.Trans.Except (ExceptT)

155import Control.Monad.Trans.RWS (RWST)

@@ -160,11 +160,9 @@ import Data.Coerce

160import Data.Default

161import Data.Dependent.Map (DMap, DSum (..), GCompare (..))

162import qualified Data.Dependent.Map as DMap

163−import Data.Either

164import Data.FastMutableIntMap (PatchIntMap)

163import Data.FastMutableIntMap (PatchIntMap)

165import Data.Foldable

164import Data.Foldable

166−import Data.Functor.Bind hiding (join)

165+import Data.Functor.Bind

167−import qualified Data.Functor.Bind as Bind

168import Data.Functor.Constant

166import Data.Functor.Constant

169import Data.Functor.Misc

167import Data.Functor.Misc

170import Data.Functor.Plus

168import Data.Functor.Plus

@@ -172,19 +170,13 @@ import Data.IntMap.Strict (IntMap)

172import qualified Data.IntMap.Strict as IntMap

170import qualified Data.IntMap.Strict as IntMap

173import Data.List.NonEmpty (NonEmpty (..))

171import Data.List.NonEmpty (NonEmpty (..))

174import Data.Map (Map)

172import Data.Map (Map)

175−import Data.Maybe

176−import Data.Monoid hiding (Alt, (<>))

177import Data.Semigroup (Semigroup, sconcat, stimes, (<>))

173import Data.Semigroup (Semigroup, sconcat, stimes, (<>))

178import Data.String

174import Data.String

179import Data.These

175import Data.These

180−import Data.Traversable

181import Data.Type.Coercion

176import Data.Type.Coercion

182import Reflex.FunctorMaybe

177import Reflex.FunctorMaybe

183import Reflex.Patch

178import Reflex.Patch

184

179

185−-- Note: must come last to silence warnings due to AMP on GHC < 7.10

186−import Prelude hiding (foldl, mapM, mapM_, sequence, sequence_)

187−

188import Debug.Trace (trace)

180import Debug.Trace (trace)

189

181

190-- | The 'Reflex' class contains all the primitive functionality needed for

182-- | The 'Reflex' class contains all the primitive functionality needed for

src/Reflex/Collection.hs+1−1

@@ -25,7 +25,7 @@ module Reflex.Collection

25 , simpleList

26 ) where

27

28−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence, sequence_)

28+import Control.Monad.Identity

29import Data.Align

30import Data.Functor.Misc

31import Data.Map (Map)

src/Reflex/DynamicWriter/Base.hs+2−1

@@ -6,6 +6,7 @@

6{-# LANGUAGE MultiParamTypeClasses #-}

7{-# LANGUAGE RankNTypes #-}

8{-# LANGUAGE ScopedTypeVariables #-}

9+{-# LANGUAGE TupleSections #-}

9{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE TypeFamilies #-}

10{-# LANGUAGE UndecidableInstances #-}

11{-# LANGUAGE UndecidableInstances #-}

11#ifdef USE_REFLEX_OPTIMIZER

12#ifdef USE_REFLEX_OPTIMIZER

@@ -78,7 +79,7 @@ mergeDynIncrementalWithMove a = unsafeBuildIncremental (mapM (sample . current)

78 Just v -> do

79 Just v -> do

79 modify (k:)

80 modify (k:)

80 return $ MapWithMove.From_Insert v

81 return $ MapWithMove.From_Insert v

81− noLongerMovedMap = Map.fromList $ fmap (\k -> (k, ())) noLongerMoved

82+ noLongerMovedMap = Map.fromList $ fmap (, ()) noLongerMoved

82 in Map.differenceWith (\e _ -> Just $ MapWithMove.nodeInfoSetTo Nothing e) pWithNewVals noLongerMovedMap --TODO: Check if any in the second map are not covered?

83 in Map.differenceWith (\e _ -> Just $ MapWithMove.nodeInfoSetTo Nothing e) pWithNewVals noLongerMovedMap --TODO: Check if any in the second map are not covered?

83

84

84-- | A basic implementation of 'MonadDynamicWriter'.

85-- | A basic implementation of 'MonadDynamicWriter'.

src/Reflex/Host/Class.hs−6

@@ -30,8 +30,6 @@ module Reflex.Host.Class

30

31import Reflex.Class

32

33−import Control.Applicative

34−import Control.Monad

35import Control.Monad.Fix

33import Control.Monad.Fix

36import Control.Monad.Identity

34import Control.Monad.Identity

37import Control.Monad.Ref

35import Control.Monad.Ref

@@ -45,10 +43,6 @@ import qualified Control.Monad.Trans.State.Strict as Strict

45import Control.Monad.Trans.Writer (WriterT)

43import Control.Monad.Trans.Writer (WriterT)

46import Data.Dependent.Sum (DSum (..))

44import Data.Dependent.Sum (DSum (..))

47import Data.GADT.Compare

45import Data.GADT.Compare

48−import Data.Monoid

49−

50−-- Note: this import must come last to silence warnings from AMP

51−import Prelude hiding (foldl, mapM, mapM_, sequence, sequence_)

52

46

53-- | Framework implementation support class for the reflex implementation

47-- | Framework implementation support class for the reflex implementation

54-- represented by @t@.

48-- represented by @t@.

src/Reflex/Patch/IntMap.hs−1

@@ -10,7 +10,6 @@ import Data.IntMap.Strict (IntMap)

10import qualified Data.IntMap.Strict as IntMap

11import Data.Maybe

12import Data.Semigroup

13−import Prelude hiding (lookup)

14import Reflex.Patch.Class

13import Reflex.Patch.Class

15

14

16newtype PatchIntMap a = PatchIntMap (IntMap (Maybe a)) deriving (Functor, Foldable, Traversable, Monoid)

15newtype PatchIntMap a = PatchIntMap (IntMap (Maybe a)) deriving (Functor, Foldable, Traversable, Monoid)

src/Reflex/Query/Base.hs+3−3

@@ -2,6 +2,7 @@

2{-# LANGUAGE GeneralizedNewtypeDeriving #-}

3{-# LANGUAGE InstanceSigs #-}

4{-# LANGUAGE KindSignatures #-}

5+{-# LANGUAGE LambdaCase #-}

5{-# LANGUAGE MultiParamTypeClasses #-}

6{-# LANGUAGE MultiParamTypeClasses #-}

6{-# LANGUAGE RankNTypes #-}

7{-# LANGUAGE RankNTypes #-}

7{-# LANGUAGE ScopedTypeVariables #-}

8{-# LANGUAGE ScopedTypeVariables #-}

@@ -253,7 +254,7 @@ dynWithQueryT f q = do

253 return result

254 return result

254 where zipDynIncrementalWith g da ib =

255 where zipDynIncrementalWith g da ib =

255 let eab = align (updated da) (updatedIncremental ib)

256 let eab = align (updated da) (updatedIncremental ib)

256− ec = flip push eab $ \o -> case o of

257+ ec = flip push eab $ \case

257 This a -> do

258 This a -> do

258 aOld <- sample $ current da

259 aOld <- sample $ current da

259 b <- sample $ currentIncremental ib

260 b <- sample $ currentIncremental ib

@@ -274,8 +275,7 @@ instance (Monad m, Group q, Additive q, Query q, Reflex t) => MonadQuery t q (Qu

274 askQueryResult = QueryT ask

275 askQueryResult = QueryT ask

275 queryIncremental q = do

276 queryIncremental q = do

276 tellQueryIncremental q

277 tellQueryIncremental q

277− r <- askQueryResult

278− return $ zipDynWith crop (incrementalToDynamic q) r

278+ zipDynWith crop (incrementalToDynamic q) <$> askQueryResult

279

280instance Requester t m => Requester t (QueryT t q m) where

281 type Request (QueryT t q m) = Request m

src/Reflex/Query/Class.hs+1−2

@@ -73,5 +73,4 @@ tellQueryDyn d = tellQueryIncremental $ unsafeBuildIncremental (sample (current

73queryDyn :: (Reflex t, Monad m, MonadQuery t q m) => Dynamic t q -> m (Dynamic t (QueryResult q))

74queryDyn q = do

75 tellQueryDyn q

76− r <- askQueryResult

77− return $ zipDynWith crop q r

76+ zipDynWith crop q <$> askQueryResult

src/Reflex/Spider/Internal.hs+6−11

@@ -9,7 +9,6 @@

9{-# LANGUAGE GADTs #-}

10{-# LANGUAGE GeneralizedNewtypeDeriving #-}

11{-# LANGUAGE LambdaCase #-}

12−{-# LANGUAGE MagicHash #-}

13{-# LANGUAGE MultiParamTypeClasses #-}

12{-# LANGUAGE MultiParamTypeClasses #-}

14{-# LANGUAGE MultiWayIf #-}

13{-# LANGUAGE MultiWayIf #-}

15{-# LANGUAGE RankNTypes #-}

14{-# LANGUAGE RankNTypes #-}

@@ -25,14 +24,16 @@

25-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.

24-- a graph traversal algorithm to propagate 'Event's and 'Behavior's.

26module Reflex.Spider.Internal (module Reflex.Spider.Internal) where

25module Reflex.Spider.Internal (module Reflex.Spider.Internal) where

27

26

27+#if MIN_VERSION_base(4,10,0)

28−import Control.Applicative

28+import Control.Applicative (liftA2)

29+#endif

29import Control.Concurrent

30import Control.Concurrent

30import Control.Exception

31import Control.Exception

31−import Control.Monad hiding (forM, forM_, mapM, mapM_, sequence)

32+import Control.Monad hiding (forM, forM_, mapM, mapM_)

32import Control.Monad.Exception

33import Control.Monad.Exception

33−import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_, sequence)

34+import Control.Monad.Identity hiding (forM, forM_, mapM, mapM_)

34import Control.Monad.Primitive

35import Control.Monad.Primitive

35−import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_, sequence)

36+import Control.Monad.Reader hiding (forM, forM_, mapM, mapM_)

36import Control.Monad.Ref

37import Control.Monad.Ref

37import Data.Align

38import Data.Align

38import Data.Coerce

39import Data.Coerce

@@ -41,7 +42,6 @@ import qualified Data.Dependent.Map as DMap

41import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))

42import Data.FastMutableIntMap (FastMutableIntMap, PatchIntMap (..))

42import qualified Data.FastMutableIntMap as FastMutableIntMap

43import qualified Data.FastMutableIntMap as FastMutableIntMap

43import Data.Foldable hiding (concat, elem, sequence_)

44import Data.Foldable hiding (concat, elem, sequence_)

44−import Data.Function

45import Data.Functor.Constant

46import Data.Functor.Misc

47import Data.Functor.Product

@@ -49,13 +49,11 @@ import Data.GADT.Compare

49import Data.IntMap.Strict (IntMap)

50import qualified Data.IntMap.Strict as IntMap

51import Data.IORef

52−import Data.List hiding (foldl')

53import Data.Maybe

52import Data.Maybe

54import Data.Monoid ((<>))

53import Data.Monoid ((<>))

55import Data.Proxy

54import Data.Proxy

56import Data.These

55import Data.These

57import Data.Traversable

56import Data.Traversable

58−import Data.Word

59import GHC.Exts

57import GHC.Exts

60import GHC.IORef (IORef (..))

58import GHC.IORef (IORef (..))

61import GHC.Stack

59import GHC.Stack

@@ -88,9 +86,6 @@ import Reflex.NotReady.Class

88import Reflex.Patch

86import Reflex.Patch

89import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove

87import qualified Reflex.Patch.DMapWithMove as PatchDMapWithMove

90

88

91−-- Note: must come last to silence warnings due to AMP on GHC < 7.10

92−import Prelude hiding (any, concat, mapM, mapM_, sequence)

93−

94#ifdef DEBUG_TRACE_EVENTS

89#ifdef DEBUG_TRACE_EVENTS

95import qualified Data.ByteString.Char8 as BS8

90import qualified Data.ByteString.Char8 as BS8

96import System.IO (stderr)

91import System.IO (stderr)