6cb5850 · reflex · git.iko.soy

git.iko.soy/reflex

Merge pull request #264 from reflex-frp/dn-minor-code-fixes

Mark distributeListOverDynPure as deprecated, remove duplication.

commit6cb58502c930e5eee88d007861881a43b7e2859a authorAli Abrar <aliabrar@gmail.com> dateMon 1 Apr 2019, 14:19 (8 years ago) parent3515f15 8d70b34

2 files changed+12−11

compare with develop

unifiedsplit

src/Reflex/Class.hs+10−1 src/Reflex/Dynamic.hs+2−10

src/Reflex/Class.hs+10−1

@@ -1093,7 +1093,16 @@ distributeListOverDyn = distributeListOverDynWith id

10931093

10941094-- | Create a new 'Dynamic' by applying a combining function to a list of 'Dynamic's

10951095distributeListOverDynWith :: Reflex t => ([a] -> b) -> [Dynamic t a] -> Dynamic t b

1096−distributeListOverDynWith f = fmap (f . map (\(Const2 _ :=> Identity v) -> v) . DMap.toList) . distributeDMapOverDynPure . DMap.fromList . map (\(k, v) -> Const2 k :=> v) . zip [0 :: Int ..]

1096+distributeListOverDynWith f =

1097+ fmap (f . map fromDSum . DMap.toAscList) .

1098+ distributeDMapOverDynPure .

1099+ DMap.fromDistinctAscList .

1100+ zipWith toDSum [0..]

1101+ where

1102+ toDSum :: Int -> Dynamic t a -> DSum (Const2 Int a) (Dynamic t)

1103+ toDSum k v = Const2 k :=> v

1104+ fromDSum :: DSum (Const2 Int a) Identity -> a

1105+ fromDSum (Const2 _ :=> Identity v) = v

10971106

10981107-- | Create a new 'Event' that occurs when the first supplied 'Event' occurs

10991108-- unless the second supplied 'Event' occurs simultaneously.

src/Reflex/Dynamic.hs+2−10

@@ -203,17 +203,9 @@ distributeMapOverDynPure = fmap dmapToMap . distributeDMapOverDynPure . mapWithF

203203

204204-- | Convert a list with 'Dynamic' elements into a 'Dynamic' of a list with

205205-- non-'Dynamic' elements, preserving the order of the elements.

206+{-# DEPRECATED distributeListOverDynPure "Use 'distributeListOverDyn' instead" #-}

206207distributeListOverDynPure :: Reflex t => [Dynamic t v] -> Dynamic t [v]

207−distributeListOverDynPure =

208− fmap (map fromDSum . DMap.toAscList) .

209− distributeDMapOverDynPure .

210− DMap.fromDistinctAscList .

211− zipWith toDSum [0..]

212− where

213− toDSum :: Int -> Dynamic t a -> DSum (Const2 Int a) (Dynamic t)

214− toDSum k v = Const2 k :=> v

215− fromDSum :: DSum (Const2 Int a) Identity -> a

216− fromDSum (Const2 _ :=> Identity v) = v

208+distributeListOverDynPure = distributeListOverDyn

217209

218210--TODO: Generalize this to functors other than Maps

219211-- | Combine a 'Dynamic' of a 'Map' of 'Dynamic's into a 'Dynamic'