diff options
| author | Herbert Valerio Riedel <hvr@gnu.org> | 2015-10-17 16:47:51 +0200 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-10-17 16:51:33 +0200 |
| commit | e8ed2136feea75f4676eb6103acd5bb1bfe35281 (patch) | |
| tree | 156daa80421dfdd923d3fa12c83809458f42d333 /compiler/cmm/PprC.hs | |
| parent | 40cbf9aaa16fd263c54e159a4bda3a5682720041 (diff) | |
| download | haskell-e8ed2136feea75f4676eb6103acd5bb1bfe35281.tar.gz | |
Make Monad/Applicative instances MRP-friendly
This patch refactors pure/(*>) and return/(>>) in MRP-friendly way, i.e.
such that the explicit definitions for `return` and `(>>)` match the
MRP-style default-implementation, i.e.
return = pure
and
(>>) = (*>)
This way, e.g. all `return = pure` definitions can easily be grepped and
removed in GHC 8.1;
Test Plan: Harbormaster
Reviewers: goldfire, alanz, bgamari, quchen, austin
Reviewed By: quchen, austin
Subscribers: thomie
Differential Revision: https://phabricator.haskell.org/D1312
Diffstat (limited to 'compiler/cmm/PprC.hs')
| -rw-r--r-- | compiler/cmm/PprC.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/cmm/PprC.hs b/compiler/cmm/PprC.hs index c96b7076bf..76659caa8f 100644 --- a/compiler/cmm/PprC.hs +++ b/compiler/cmm/PprC.hs @@ -1005,12 +1005,12 @@ instance Functor TE where fmap = liftM instance Applicative TE where - pure = return + pure a = TE $ \s -> (a, s) (<*>) = ap instance Monad TE where TE m >>= k = TE $ \s -> case m s of (a, s') -> unTE (k a) s' - return a = TE $ \s -> (a, s) + return = pure te_lbl :: CLabel -> TE () te_lbl lbl = TE $ \(temps,lbls) -> ((), (temps, Map.insert lbl () lbls)) |