Skip to content

Commit 0ee6037

Browse files
garybgaryb
committed
Updates for 0.12
1 parent cea6d90 commit 0ee6037

File tree

21 files changed

+81
-110
lines changed

21 files changed

+81
-110
lines changed

‎bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@
2424
"package.json"
2525
],
2626
"dependencies": {
27-
"purescript-arrays": "^4.0.0",
28-
"purescript-lazy": "^3.0.0",
29-
"purescript-distributive": "^3.0.0",
30-
"purescript-tuples": "^4.0.0"
27+
"purescript-arrays": "#compiler/0.12",
28+
"purescript-lazy": "#compiler/0.12",
29+
"purescript-distributive": "#compiler/0.12",
30+
"purescript-tuples": "#compiler/0.12"
3131
},
3232
"devDependencies": {
33-
"purescript-console": "^3.0.0"
33+
"purescript-console": "#compiler/0.12"
3434
}
3535
}

‎src/Control/Comonad/Store/Class.purs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ import Control.Comonad.Store.Trans (StoreT(..))
1010
import Control.Comonad.Traced.Trans (TracedT)
1111
import Control.Comonad.Trans.Class (lower)
1212
import Control.Extend (duplicate)
13-
1413
import Data.Tuple (Tuple(..))
15-
import Data.Monoid (class Monoid)
1614

1715
-- | The `ComonadStore` type class represents those monads which support local position information via
1816
-- | `pos` and `peek`.

‎src/Control/Comonad/Traced/Class.purs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ import Prelude
66

77
import Control.Comonad (class Comonad, extract)
88
import Control.Comonad.Traced.Trans (TracedT(..))
9-
10-
import Data.Monoid (class Monoid)
119
import Data.Tuple (Tuple(..))
1210

1311
-- | The `ComonadTraced` type class represents those monads which support relative (monoidal)

‎src/Control/Comonad/Traced/Trans.purs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@ import Prelude
77
import Control.Comonad (class Comonad, extract)
88
import Control.Comonad.Trans.Class (class ComonadTrans)
99
import Control.Extend (class Extend, (<<=))
10-
11-
import Data.Monoid (class Monoid, mempty)
1210
import Data.Newtype (class Newtype)
1311

1412
-- | The cowriter comonad transformer.

‎src/Control/Monad/Cont/Trans.purs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,11 @@ module Control.Monad.Cont.Trans
99
import Prelude
1010

1111
import Control.Monad.Cont.Class (class MonadCont, callCC)
12-
import Control.Monad.Eff.Class (class MonadEff, liftEff)
1312
import Control.Monad.Reader.Class (class MonadAsk, class MonadReader, ask, local)
1413
import Control.Monad.State.Class (class MonadState, state)
1514
import Control.Monad.Trans.Class (class MonadTrans, lift)
16-
1715
import Data.Newtype (class Newtype)
16+
import Effect.Class (class MonadEffect, liftEffect)
1817

1918
-- | The CPS monad transformer.
2019
-- |
@@ -55,8 +54,8 @@ instance monadContT :: Monad m => Monad (ContT r m)
5554
instance monadTransContT :: MonadTrans (ContT r) where
5655
lift m = ContT (\k -> m >>= k)
5756

58-
instance monadEffContT :: MonadEff eff m => MonadEff eff (ContT r m) where
59-
liftEff = lift <<< liftEff
57+
instance monadEffectContT :: MonadEffect m => MonadEffect (ContT r m) where
58+
liftEffect = lift <<< liftEffect
6059

6160
instance monadAskContT :: MonadAsk r1 m => MonadAsk r1 (ContT r m) where
6261
ask = lift ask

‎src/Control/Monad/Except/Trans.purs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import Prelude
1111
import Control.Alt (class Alt)
1212
import Control.Alternative (class Alternative)
1313
import Control.Monad.Cont.Class (class MonadCont, callCC)
14-
import Control.Monad.Eff.Class (class MonadEff, liftEff)
1514
import Control.Monad.Error.Class (class MonadThrow, class MonadError, throwError, catchError)
1615
import Control.Monad.Reader.Class (class MonadAsk, class MonadReader, ask, local)
1716
import Control.Monad.Rec.Class (class MonadRec, tailRecM, Step(..))
@@ -21,11 +20,10 @@ import Control.Monad.Writer.Class (class MonadWriter, class MonadTell, pass, lis
2120
import Control.MonadPlus (class MonadPlus)
2221
import Control.MonadZero (class MonadZero)
2322
import Control.Plus (class Plus)
24-
2523
import Data.Either (Either(..), either)
26-
import Data.Monoid (class Monoid, mempty)
2724
import Data.Newtype (class Newtype)
2825
import Data.Tuple (Tuple(..))
26+
import Effect.Class (class MonadEffect, liftEffect)
2927

3028
-- | A monad transformer which adds exceptions to other monads, in the same way
3129
-- | as `Except`. As before, `e` is the type of exceptions, and `a` is the type
@@ -103,8 +101,8 @@ instance monadTransExceptT :: MonadTrans (ExceptT e) where
103101
a <- m
104102
pure $ Right a
105103

106-
instance monadEffExceptT :: MonadEff eff m => MonadEff eff (ExceptT e m) where
107-
liftEff = lift <<< liftEff
104+
instance monadEffectExceptT :: MonadEffect m => MonadEffect (ExceptT e m) where
105+
liftEffect = lift <<< liftEffect
108106

109107
instance monadContExceptT :: MonadCont m => MonadCont (ExceptT e m) where
110108
callCC f = ExceptT $ callCC \c ->
@@ -136,5 +134,5 @@ instance monadWriterExceptT :: MonadWriter w m => MonadWriter w (ExceptT e m) wh
136134
pass = mapExceptT \m -> pass do
137135
a <- m
138136
pure case a of
139-
Left e -> Tuple (Left e) id
137+
Left e -> Tuple (Left e) identity
140138
Right (Tuple r f) -> Tuple (Right r) f

‎src/Control/Monad/List/Trans.purs

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,19 +40,17 @@ import Prelude
4040

4141
import Control.Alt (class Alt)
4242
import Control.Alternative (class Alternative)
43-
import Control.Monad.Eff.Class (class MonadEff, liftEff)
43+
import Control.Monad.Rec.Class as MR
4444
import Control.Monad.Trans.Class (class MonadTrans, lift)
4545
import Control.MonadPlus (class MonadPlus)
46-
import Control.Monad.Rec.Class as MR
4746
import Control.MonadZero (class MonadZero)
4847
import Control.Plus (class Plus)
49-
5048
import Data.Lazy (Lazy, defer, force)
5149
import Data.Maybe (Maybe(..), fromMaybe)
52-
import Data.Monoid (class Monoid)
5350
import Data.Newtype (class Newtype)
5451
import Data.Tuple (Tuple(..), fst, snd)
5552
import Data.Unfoldable (class Unfoldable)
53+
import Effect.Class (class MonadEffect, liftEffect)
5654

5755
-- | The list monad transformer.
5856
-- |
@@ -139,7 +137,7 @@ iterate f a = unfold g a
139137

140138
-- | Generate an infinite list by repeating a value.
141139
repeat :: forall f a. Monad f => a -> ListT f a
142-
repeat = iterate id
140+
repeat = iterate identity
143141

144142
-- | Take a number of elements from the front of a list.
145143
take :: forall f a. Applicative f => Int -> ListT f a -> ListT f a
@@ -187,7 +185,7 @@ mapMaybe f = stepMap g where
187185

188186
-- | Remove elements from a list which do not contain a value.
189187
catMaybes :: forall f a. Functor f => ListT f (Maybe a) -> ListT f a
190-
catMaybes = mapMaybe id
188+
catMaybes = mapMaybe identity
191189

192190
-- | Perform the first step of a computation in the `ListT` monad.
193191
uncons :: forall f a. Monad f => ListT f a -> f (Maybe (Tuple a (ListT f a)))
@@ -318,5 +316,5 @@ instance monadZeroListT :: Monad f => MonadZero (ListT f)
318316

319317
instance monadPlusListT :: Monad f => MonadPlus (ListT f)
320318

321-
instance monadEffListT :: MonadEff eff m => MonadEff eff (ListT m) where
322-
liftEff = lift <<< liftEff
319+
instance monadEffectListT :: MonadEffect m => MonadEffect (ListT m) where
320+
liftEffect = lift <<< liftEffect

‎src/Control/Monad/Maybe/Trans.purs

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ import Prelude
1010
import Control.Alt (class Alt)
1111
import Control.Alternative (class Alternative)
1212
import Control.Monad.Cont.Class (class MonadCont, callCC)
13-
import Control.Monad.Eff.Class (class MonadEff, liftEff)
1413
import Control.Monad.Error.Class (class MonadThrow, class MonadError, catchError, throwError)
1514
import Control.Monad.Reader.Class (class MonadAsk, class MonadReader, ask, local)
1615
import Control.Monad.Rec.Class (class MonadRec, tailRecM, Step(..))
@@ -20,10 +19,10 @@ import Control.Monad.Writer.Class (class MonadWriter, class MonadTell, pass, lis
2019
import Control.MonadPlus (class MonadPlus)
2120
import Control.MonadZero (class MonadZero)
2221
import Control.Plus (class Plus)
23-
2422
import Data.Maybe (Maybe(..))
2523
import Data.Newtype (class Newtype)
2624
import Data.Tuple (Tuple(..))
25+
import Effect.Class (class MonadEffect, liftEffect)
2726

2827
-- | The `MaybeT` monad transformer.
2928
-- |
@@ -87,8 +86,8 @@ instance monadRecMaybeT :: MonadRec m => MonadRec (MaybeT m) where
8786
Just (Loop a1) -> Loop a1
8887
Just (Done b) -> Done (Just b)
8988

90-
instance monadEffMaybe :: MonadEff eff m => MonadEff eff (MaybeT m) where
91-
liftEff = lift <<< liftEff
89+
instance monadEffectMaybe :: MonadEffect m => MonadEffect (MaybeT m) where
90+
liftEffect = lift <<< liftEffect
9291

9392
instance monadContMaybeT :: MonadCont m => MonadCont (MaybeT m) where
9493
callCC f =
@@ -120,5 +119,5 @@ instance monadWriterMaybeT :: MonadWriter w m => MonadWriter w (MaybeT m) where
120119
pass = mapMaybeT \m -> pass do
121120
a <- m
122121
pure case a of
123-
Nothing -> Tuple Nothing id
122+
Nothing -> Tuple Nothing identity
124123
Just (Tuple v f) -> Tuple (Just v) f

‎src/Control/Monad/RWS/Trans.purs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,16 @@ import Prelude
1111
import Control.Alt (class Alt, (<|>))
1212
import Control.Alternative (class Alternative)
1313
import Control.Lazy (class Lazy)
14-
import Control.Monad.Eff.Class (class MonadEff, liftEff)
1514
import Control.Monad.Error.Class (class MonadThrow, class MonadError, throwError, catchError)
1615
import Control.Monad.Reader.Class (class MonadAsk, class MonadReader)
1716
import Control.Monad.Rec.Class (class MonadRec, tailRecM, Step(..))
1817
import Control.Monad.State.Class (class MonadState)
1918
import Control.Monad.Trans.Class (class MonadTrans, lift)
2019
import Control.Monad.Writer.Class (class MonadWriter, class MonadTell)
2120
import Control.Plus (class Plus, empty)
22-
23-
import Data.Monoid (class Monoid, mempty)
2421
import Data.Newtype (class Newtype)
2522
import Data.Tuple (Tuple(..), uncurry)
23+
import Effect.Class (class MonadEffect, liftEffect)
2624

2725
data RWSResult state result writer = RWSResult state result writer
2826

@@ -85,8 +83,8 @@ instance monadTransRWST :: Monoid w => MonadTrans (RWST r w s) where
8583
instance lazyRWST :: Lazy (RWST r w s m a) where
8684
defer f = RWST \r s -> case f unit of RWST f' -> f' r s
8785

88-
instance monadEffRWS :: (Monoid w, MonadEff eff m) => MonadEff eff (RWST r w s m) where
89-
liftEff = lift <<< liftEff
86+
instance monadEffectRWS :: (Monoid w, MonadEffect m) => MonadEffect (RWST r w s m) where
87+
liftEffect = lift <<< liftEffect
9088

9189
instance monadAskRWST :: (Monad m, Monoid w) => MonadAsk r (RWST r w s m) where
9290
ask = RWST \r s -> pure $ RWSResult s r mempty

‎src/Control/Monad/Reader/Class.purs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class Monad m <= MonadAsk r m | m -> r where
1717
ask :: m r
1818

1919
instance monadAskFun :: MonadAsk r ((->) r) where
20-
ask = id
20+
ask = identity
2121

2222
-- | Projects a value from the global context in a `MonadAsk`.
2323
asks :: forall r m a. MonadAsk r m => (r -> a) -> m a

0 commit comments

Comments
 (0)