2d282dc · patch · git.iko.soy

git.iko.soy/patch

Fix some more `occur*` misspellings

commit2d282dc5e7cee66e937ec02e08d3cc51c6e78b16 authorJohn Ericson <John.Ericson@Obsidian.Systems> dateTue 17 Jul 2018, 23:36 (8 years ago) parent0b6ac99

4 files changed+17−17

compare with develop

unifiedsplit

src/Reflex/Class.hs+11−11 src/Reflex/Dynamic.hs+2−2 src/Reflex/Time.hs+2−2 test/Reflex/Plan/Reflex.hs+2−2

src/Reflex/Class.hs+11−11

@@ -226,7 +226,7 @@ class ( MonadHold t (PushM t)

226226 -- recomputed whenever any of the read 'Behavior's changes

227227 pull :: PullM t a -> Behavior t a

228228 -- | Merge a collection of events; the resulting 'Event' will only occur if at

229− -- least one input event is occuring, and will contain all of the input keys

229+ -- least one input event is occurring, and will contain all of the input keys

230230 -- that are occurring simultaneously

231231 merge :: GCompare k => DMap k (Event t) -> Event t (DMap k Identity) --TODO: Generalize to get rid of DMap use --TODO: Provide a type-level guarantee that the result is not empty

232232 -- | Efficiently fan-out an event to many destinations. This function should

@@ -337,7 +337,7 @@ class MonadSample t m => MonadHold t m where

337337 default buildDynamic :: (m ~ f m', MonadTrans f, MonadHold t m') => PullM t a -> Event t a -> m (Dynamic t a)

338338 buildDynamic getV0 = lift . buildDynamic getV0

339339 -}

340− -- | Create a new 'Event' that only occurs only once, on the first occurence of

340+ -- | Create a new 'Event' that only occurs only once, on the first occurrence of

341341 -- the supplied 'Event'.

342342 headE :: Event t a -> m (Event t a)

343343

@@ -566,7 +566,7 @@ tailE e = snd <$> headTailE e

566566

567567-- | Create a tuple of two 'Event's with the first one occurring only the first

568568-- time the supplied 'Event' occurs and the second occurring on all but the first

569−-- occurence.

569+-- occurrence.

570570headTailE :: (Reflex t, MonadHold t m) => Event t a -> m (Event t a, Event t a)

571571headTailE e = do

572572 eHead <- headE e

@@ -586,13 +586,13 @@ takeWhileE f e = do

586586 let e' = switch be

587587 return eTrue

588588

589−-- | Split the supplied 'Event' into two individual 'Event's occuring at the

589+-- | Split the supplied 'Event' into two individual 'Event's occurring at the

590590-- same time with the respective values from the tuple.

591591splitE :: Reflex t => Event t (a, b) -> (Event t a, Event t b)

592592splitE e = (fmap fst e, fmap snd e)

593593

594594-- | Print the supplied 'String' and the value of the 'Event' on each

595−-- occurence. This should /only/ be used for debugging.

595+-- occurrence. This should /only/ be used for debugging.

596596--

597597-- Note: As with Debug.Trace.trace, the message will only be printed if the

598598-- 'Event' is actually used.

@@ -654,7 +654,7 @@ unsafeMapIncremental f g a = unsafeBuildIncremental (fmap f $ sample $ currentIn

654654

655655-- | Create a new 'Event' combining the map of 'Event's into an 'Event' that

656656-- occurs if at least one of them occurs and has a map of values of all 'Event's

657−-- occuring at that time.

657+-- occurring at that time.

658658mergeMap :: (Reflex t, Ord k) => Map k (Event t a) -> Event t (Map k a)

659659mergeMap = fmap dmapToMap . merge . mapWithFunctorToDMap

660660

@@ -741,7 +741,7 @@ instance Reflex t => Align (Event t) where

741741 align = alignEventWithMaybe Just

742742

743743-- | Create a new 'Event' that only occurs if the supplied 'Event' occurs and

744−-- the 'Behavior' is true at the time of occurence.

744+-- the 'Behavior' is true at the time of occurrence.

745745gate :: Reflex t => Behavior t Bool -> Event t a -> Event t a

746746gate = attachWithMaybe $ \allow a -> if allow then Just a else Nothing

747747

@@ -969,7 +969,7 @@ instance Reflex t => Accumulator t (Event t) where

969969 accumMaybeM f z e = updated <$> accumMaybeM f z e

970970 mapAccumMaybeM f z e = first updated <$> mapAccumMaybeM f z e

971971

972−-- | Create a new 'Event' by combining each occurence with the next value of the

972+-- | Create a new 'Event' by combining each occurrence with the next value of the

973973-- list using the supplied function. If the list runs out of items, all

974974-- subsequent 'Event' occurrences will be ignored.

975975zipListWithEvent :: (Reflex t, MonadHold t m, MonadFix m) => (a -> b -> c) -> [a] -> Event t b -> m (Event t c)

@@ -979,17 +979,17 @@ zipListWithEvent f l e = do

979979 _ -> (Nothing, Nothing) --TODO: Unsubscribe the event?

980980 mapAccumMaybe_ f' l e

981981

982−-- | Assign a number to each occurence of the given 'Event', starting from 0

982+-- | Assign a number to each occurrence of the given 'Event', starting from 0

983983{-# INLINE numberOccurrences #-}

984984numberOccurrences :: (Reflex t, MonadHold t m, MonadFix m, Num b) => Event t a -> m (Event t (b, a))

985985numberOccurrences = numberOccurrencesFrom 0

986986

987−-- | Assign a number to each occurence of the given 'Event'

987+-- | Assign a number to each occurrence of the given 'Event'

988988{-# INLINE numberOccurrencesFrom #-}

989989numberOccurrencesFrom :: (Reflex t, MonadHold t m, MonadFix m, Num b) => b -> Event t a -> m (Event t (b, a))

990990numberOccurrencesFrom = mapAccum_ (\n a -> let !next = n + 1 in (next, (n, a)))

991991

992−-- | Assign a number to each occurence of the given 'Event'; discard the occurrences' values

992+-- | Assign a number to each occurrence of the given 'Event'; discard the occurrences' values

993993{-# INLINE numberOccurrencesFrom_ #-}

994994numberOccurrencesFrom_ :: (Reflex t, MonadHold t m, MonadFix m, Num b) => b -> Event t a -> m (Event t b)

995995numberOccurrencesFrom_ = mapAccum_ (\n _ -> let !next = n + 1 in (next, n))

src/Reflex/Dynamic.hs+2−2

@@ -173,7 +173,7 @@ foldDynMaybe = accumMaybeDyn . flip

173173foldDynMaybeM :: (Reflex t, MonadHold t m, MonadFix m) => (a -> b -> PushM t (Maybe b)) -> b -> Event t a -> m (Dynamic t b)

174174foldDynMaybeM = accumMaybeMDyn . flip

175175

176−-- | Create a new 'Dynamic' that counts the occurences of the 'Event'.

176+-- | Create a new 'Dynamic' that counts the occurrences of the 'Event'.

177177count :: (Reflex t, MonadHold t m, MonadFix m, Num b) => Event t a -> m (Dynamic t b)

178178count e = holdDyn 0 =<< zipListWithEvent const (iterate (+1) 1) e

179179

@@ -287,7 +287,7 @@ attachPromptlyDyn = attachPromptlyDynWith (,)

287287attachPromptlyDynWith :: Reflex t => (a -> b -> c) -> Dynamic t a -> Event t b -> Event t c

288288attachPromptlyDynWith f = attachPromptlyDynWithMaybe $ \a b -> Just $ f a b

289289

290−-- | Create a new 'Event' by combining the value at each occurence with the

290+-- | Create a new 'Event' by combining the value at each occurrence with the

291291-- current value of the 'Dynamic' value and possibly filtering if the combining

292292-- function returns 'Nothing'.

293293--

src/Reflex/Time.hs+2−2

@@ -107,7 +107,7 @@ delay dt e = performEventAsync $ ffor e $ \a cb -> liftIO $ void $ forkIO $ do

107107 cb a

108108

109109-- | Send events with Poisson timing with the given basis and rate

110−-- Each occurence of the resulting event will contain the index of

110+-- Each occurrence of the resulting event will contain the index of

111111-- the current interval, with 0 representing the basis time

112112poissonLossyFrom

113113 :: (RandomGen g, MonadIO (Performable m), PerformEvent t m, TriggerEvent t m)

@@ -126,7 +126,7 @@ poissonLossyFrom rnd rate = inhomogeneousPoissonFrom rnd (constant rate) rate

126126

127127

128128-- | Send events with Poisson timing with the given basis and rate

129−-- Each occurence of the resulting event will contain the index of

129+-- Each occurrence of the resulting event will contain the index of

130130-- the current interval, with 0 representing the basis time.

131131-- Automatically begin sending events when the DOM is built

132132poissonLossy

test/Reflex/Plan/Reflex.hs+2−2

@@ -74,13 +74,13 @@ deriving instance ReflexHost t => MonadFix (Plan t)

7474

7575

7676instance (ReflexHost t, MonadRef (HostFrame t), Ref (HostFrame t) ~ Ref IO) => TestPlan t (Plan t) where

77− plan occurances = Plan $ do

77+ plan occurrences = Plan $ do

7878 (e, ref) <- newEventWithTriggerRef

7979 modify (IntMap.unionWith mappend (firings ref))

8080 return e

8181

8282 where

83− firings ref = IntMap.fromList (makeFiring ref <$> occurances)

83+ firings ref = IntMap.fromList (makeFiring ref <$> occurrences)

8484 makeFiring ref (t, a) = (fromIntegral t, [Firing ref a])

8585

8686