Skip to content

Commit 2d0a471

Browse files
committed
Update build, fix warnings
1 parent 5fd4c6e commit 2d0a471

20 files changed

+102
-70
lines changed

.travis.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
language: node_js
2-
sudo: required
32
dist: trusty
4-
node_js: 5
3+
sudo: required
4+
node_js: 6
55
env:
66
- PATH=$HOME/purescript:$PATH
77
install:
@@ -11,14 +11,13 @@ install:
1111
- chmod a+x $HOME/purescript
1212
- npm install -g bower
1313
- npm install
14-
- bower install
1514
script:
16-
- npm run build
15+
- bower install --production
16+
- npm run -s build
17+
- bower install
18+
- npm -s test
1719
after_success:
1820
- >-
1921
test $TRAVIS_TAG &&
20-
psc-publish > .pursuit.json &&
21-
curl -X POST http://pursuit.purescript.org/packages \
22-
-d @.pursuit.json \
23-
-H 'Accept: application/json' \
24-
-H "Authorization: token ${GITHUB_TOKEN}"
22+
echo $GITHUB_TOKEN | pulp login &&
23+
echo y | pulp publish --no-push

bower.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"package.json"
2525
],
2626
"dependencies": {
27+
"purescript-arrays": "^1.0.0-rc.5",
2728
"purescript-distributive": "^1.0.0-rc.1",
2829
"purescript-lazy": "^1.0.0-rc.1",
2930
"purescript-tailrec": "^1.0.0-rc.1",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
"private": true,
33
"scripts": {
44
"clean": "rimraf output && rimraf .pulp-cache",
5-
"build": "pulp build",
5+
"build": "pulp build --censor-lib --strict",
66
"test": "pulp test"
77
},
88
"devDependencies": {
9-
"pulp": "^8.1.0",
9+
"pulp": "^8.2.0",
10+
"purescript-psa": "^0.3.8",
1011
"rimraf": "^2.5.0"
1112
}
1213
}

src/Control/Comonad/Env.purs

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,19 @@
11
-- | This module defines the `Env` comonad.
22

3-
module Control.Comonad.Env where
3+
module Control.Comonad.Env
4+
( Env
5+
, runEnv
6+
, withEnv
7+
, mapEnv
8+
, env
9+
, module Control.Comonad.Env.Class
10+
, module Control.Comonad.Env.Trans
11+
) where
412

513
import Prelude
614

7-
import Control.Comonad.Env.Trans (EnvT(..), withEnvT)
15+
import Control.Comonad.Env.Class (class ComonadEnv, ask, asks, local)
16+
import Control.Comonad.Env.Trans (EnvT(..), mapEnvT, runEnvT, withEnvT)
817

918
import Data.Identity (Identity(..), runIdentity)
1019
import Data.Tuple (Tuple(..))

src/Control/Comonad/Store.purs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
-- | This module defines the `Store` comonad.
22

3-
module Control.Comonad.Store where
3+
module Control.Comonad.Store
4+
( Store
5+
, runStore
6+
, store
7+
, module Control.Comonad.Store.Class
8+
, module Control.Comonad.Store.Trans
9+
) where
410

511
import Prelude
612

7-
import Control.Comonad.Store.Trans (StoreT(..))
13+
import Control.Comonad.Store.Class (class ComonadStore, experiment, peek, peeks, pos, seek, seeks)
14+
import Control.Comonad.Store.Trans (StoreT(..), runStoreT)
815

916
import Data.Identity (Identity(..), runIdentity)
1017
import Data.Tuple (Tuple(..), swap)

src/Control/Comonad/Traced.purs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,17 @@
11
-- | This module defines the `Traced` comonad.
22

3-
module Control.Comonad.Traced where
3+
module Control.Comonad.Traced
4+
( Traced
5+
, runTraced
6+
, traced
7+
, module Control.Comonad.Traced.Class
8+
, module Control.Comonad.Traced.Trans
9+
) where
410

511
import Prelude
612

7-
import Control.Comonad.Traced.Trans (TracedT(..))
13+
import Control.Comonad.Traced.Class (class ComonadTraced, censor, listen, listens, track, tracks)
14+
import Control.Comonad.Traced.Trans (TracedT(..), runTracedT)
815

916
import Data.Identity (Identity(..), runIdentity)
1017

src/Control/Monad/Cont.purs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,16 @@ module Control.Monad.Cont
44
( Cont
55
, cont
66
, runCont
7-
, module X
7+
, module Control.Monad.Cont.Trans
8+
, module Control.Monad.Cont.Class
89
) where
910

1011
import Prelude
1112

12-
import Control.Monad.Cont.Trans (ContT(ContT), mapContT, runContT, withContT)
13-
import Control.Monad.Cont.Class (callCC) as X
14-
import Data.Identity (Identity(Identity), runIdentity)
13+
import Control.Monad.Cont.Class (class MonadCont, callCC)
14+
import Control.Monad.Cont.Trans (class MonadTrans, ContT(..), lift, mapContT, runContT, withContT)
15+
16+
import Data.Identity (Identity(..), runIdentity)
1517

1618
-- | The `Cont` monad is a synonym for the `ContT` monad transformer applied to
1719
-- | the `Identity` monad.

src/Control/Monad/Cont/Trans.purs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import Prelude
1010

1111
import Control.Monad.Cont.Class (class MonadCont, callCC)
1212
import Control.Monad.Eff.Class (class MonadEff, liftEff)
13-
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
14-
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
13+
import Control.Monad.Reader.Class (class MonadReader, ask, local)
14+
import Control.Monad.State.Class (class MonadState, state)
1515
import Control.Monad.Trans (class MonadTrans, lift)
1616

1717
-- | The CPS monad transformer.

src/Control/Monad/Except.purs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,13 @@ module Control.Monad.Except
55
, mapExcept
66
, withExcept
77
, module Control.Monad.Error.Class
8-
, module Trans
8+
, module Control.Monad.Except.Trans
99
) where
1010

1111
import Prelude
1212

13-
import Control.Monad.Error.Class (class MonadError, throwError, catchError, catchJust)
14-
import Control.Monad.Except.Trans (except) as Trans
15-
import Control.Monad.Except.Trans (ExceptT(..), withExceptT, runExceptT, mapExceptT)
13+
import Control.Monad.Error.Class (class MonadError, catchError, catchJust, throwError)
14+
import Control.Monad.Except.Trans (class MonadTrans, ExceptT(..), except, lift, mapExceptT, runExceptT, withExceptT)
1615

1716
import Data.Either (Either)
1817
import Data.Identity (Identity(..), runIdentity)

src/Control/Monad/List/Trans.purs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,8 @@ stepMap f (ListT l) = ListT $ f <$> l
9292
-- | Append one list to another.
9393
concat :: forall f a. Applicative f => ListT f a -> ListT f a -> ListT f a
9494
concat x y = stepMap f x where
95-
f (Yield a s) = Yield a ((<> y) <$> s)
96-
f (Skip s) = Skip ((<> y) <$> s)
95+
f (Yield a s) = Yield a ((_ <> y) <$> s)
96+
f (Skip s) = Skip ((_ <> y) <$> s)
9797
f Done = Skip (defer $ const y)
9898

9999
-- | Create a list with one element.
@@ -102,7 +102,7 @@ singleton a = prepend a nil
102102

103103
-- | Lift a computation from the base functor.
104104
fromEffect :: forall f a. Applicative f => f a -> ListT f a
105-
fromEffect fa = ListT $ (`Yield` (defer $ \_ -> nil)) <$> fa
105+
fromEffect fa = ListT $ (flip Yield (defer $ \_ -> nil)) <$> fa
106106

107107
-- | Lift a computation from the base monad.
108108
wrapEffect :: forall f a. Functor f => f (ListT f a) -> ListT f a
@@ -265,8 +265,8 @@ instance bindListT :: Monad f => Bind (ListT f) where
265265
g (Yield a s) = Skip (h <$> s)
266266
where
267267
h s = f a <> (s >>= f)
268-
g (Skip s) = Skip ((>>= f) <$> s)
269-
g Done = Done
268+
g (Skip s) = Skip ((_ >>= f) <$> s)
269+
g Done = Done
270270

271271
instance monadListT :: Monad f => Monad (ListT f)
272272

src/Control/Monad/Maybe/Trans.purs

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,20 +11,19 @@ import Control.Alt (class Alt)
1111
import Control.Alternative (class Alternative)
1212
import Control.Monad.Cont.Class (class MonadCont, callCC)
1313
import Control.Monad.Eff.Class (class MonadEff, liftEff)
14-
import Control.Monad.Error.Class (class MonadError, catchError, catchJust, throwError)
15-
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
16-
import Control.Monad.Rec.Class (class MonadRec, forever, tailRec, tailRecM, tailRecM2, tailRecM3)
14+
import Control.Monad.Error.Class (class MonadError, catchError, throwError)
15+
import Control.Monad.Reader.Class (class MonadReader, local, ask)
16+
import Control.Monad.Rec.Class (class MonadRec, tailRecM)
1717
import Control.Monad.RWS.Class (class MonadRWS)
18-
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
18+
import Control.Monad.State.Class (class MonadState, state)
1919
import Control.Monad.Trans (class MonadTrans, lift)
20-
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
20+
import Control.Monad.Writer.Class (class MonadWriter, pass, listen, writer)
2121
import Control.MonadPlus (class MonadPlus)
2222
import Control.MonadZero (class MonadZero)
2323
import Control.Plus (class Plus)
2424

2525
import Data.Either (Either(..))
2626
import Data.Maybe (Maybe(..))
27-
import Data.Monoid (class Monoid)
2827
import Data.Tuple (Tuple(..))
2928

3029
-- | The `MaybeT` monad transformer.

src/Control/Monad/RWS.purs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ module Control.Monad.RWS
88
, execRWS
99
, mapRWS
1010
, withRWS
11-
, module X
11+
, module Control.Monad.RWS.Class
12+
, module Control.Monad.RWS.Trans
1213
) where
1314

1415
import Prelude
1516

16-
import Control.Monad.RWS.Class as X
17-
import Control.Monad.RWS.Trans (RWST(..), RWSResult, runRWST, mapRWST, withRWST, execRWST, evalRWST)
17+
import Control.Monad.RWS.Class (class MonadRWS, class MonadReader, class MonadState, class MonadTrans, class MonadWriter, ask, censor, get, gets, lift, listen, listens, local, modify, pass, put, reader, state, tell, writer)
18+
import Control.Monad.RWS.Trans (class MonadTrans, RWSResult(..), RWST(..), evalRWST, execRWST, lift, mapRWST, runRWST, withRWST)
1819

1920
import Data.Identity (Identity(..), runIdentity)
2021
import Data.Tuple (Tuple)

src/Control/Monad/RWS/Class.purs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,11 @@ module Control.Monad.RWS.Class
88
, module Control.Monad.State.Class
99
) where
1010

11-
import Prelude
12-
1311
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
1412
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
1513
import Control.Monad.Trans (class MonadTrans, lift)
1614
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
1715

18-
import Data.Monoid (class Monoid)
1916

2017
-- | `MonadRWS r w s` combines the operations and laws of the `MonadReader r`,
2118
-- | `MonadWriter w` and `MonadState s` type classes.

src/Control/Monad/Reader.purs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@ module Control.Monad.Reader
55
, runReader
66
, mapReader
77
, withReader
8-
, module X
8+
, module Control.Monad.Reader.Class
9+
, module Control.Monad.Reader.Trans
910
) where
1011

1112
import Prelude
1213

13-
import Control.Monad.Reader.Class (ask, local, reader) as X
14-
import Control.Monad.Reader.Trans (ReaderT(..), mapReaderT, withReaderT)
14+
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
15+
import Control.Monad.Reader.Trans (class MonadTrans, ReaderT(..), lift, mapReaderT, runReaderT, withReaderT)
1516

1617
import Data.Identity (Identity(..), runIdentity)
1718

src/Control/Monad/Reader/Trans.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,12 @@ import Control.Alt (class Alt, (<|>))
1212
import Control.Alternative (class Alternative)
1313
import Control.Monad.Cont.Class (class MonadCont, callCC)
1414
import Control.Monad.Eff.Class (class MonadEff, liftEff)
15-
import Control.Monad.Error.Class (class MonadError, catchError, catchJust, throwError)
15+
import Control.Monad.Error.Class (class MonadError, catchError, throwError)
1616
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
17-
import Control.Monad.Rec.Class (class MonadRec, forever, tailRec, tailRecM, tailRecM2, tailRecM3)
18-
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
17+
import Control.Monad.Rec.Class (class MonadRec, tailRecM)
18+
import Control.Monad.State.Class (class MonadState, state)
1919
import Control.Monad.Trans (class MonadTrans, lift)
20-
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
20+
import Control.Monad.Writer.Class (class MonadWriter, pass, listen, writer)
2121
import Control.MonadPlus (class MonadPlus)
2222
import Control.MonadZero (class MonadZero)
2323
import Control.Plus (class Plus, empty)

src/Control/Monad/State.purs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,17 @@ module Control.Monad.State
77
, execState
88
, mapState
99
, withState
10-
, module X
10+
, module Control.Monad.State.Class
11+
, module Control.Monad.State.Trans
1112
) where
1213

1314
import Prelude
1415

15-
import Control.Monad.State.Class (get, gets, put, modify) as X
16-
import Control.Monad.State.Trans (StateT(..), runStateT, withStateT, mapStateT)
16+
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
17+
import Control.Monad.State.Trans (class MonadTrans, StateT(..), evalStateT, execStateT, lift, mapStateT, runStateT, withStateT)
1718

1819
import Data.Identity (Identity(..), runIdentity)
19-
import Data.Tuple (Tuple(..), fst, snd)
20+
import Data.Tuple (Tuple(Tuple))
2021

2122
-- | The `State` monad is a synonym for the `StateT` monad transformer, applied
2223
-- | to the `Identity` monad.

src/Control/Monad/State/Trans.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ import Control.Alternative (class Alternative)
1313
import Control.Lazy (class Lazy)
1414
import Control.Monad.Cont.Class (class MonadCont, callCC)
1515
import Control.Monad.Eff.Class (class MonadEff, liftEff)
16-
import Control.Monad.Error.Class (class MonadError, catchError, catchJust, throwError)
17-
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
18-
import Control.Monad.Rec.Class (class MonadRec, forever, tailRec, tailRecM, tailRecM2, tailRecM3)
16+
import Control.Monad.Error.Class (class MonadError, catchError, throwError)
17+
import Control.Monad.Reader.Class (class MonadReader, local, ask)
18+
import Control.Monad.Rec.Class (class MonadRec, tailRecM)
1919
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
2020
import Control.Monad.Trans (class MonadTrans, lift)
21-
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
21+
import Control.Monad.Writer.Class (class MonadWriter, pass, listen, writer)
2222
import Control.MonadPlus (class MonadPlus)
2323
import Control.MonadZero (class MonadZero)
2424
import Control.Plus (class Plus, empty)

src/Control/Monad/Writer.purs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@ module Control.Monad.Writer
66
, execWriter
77
, mapWriter
88
, module Control.Monad.Writer.Class
9+
, module Control.Monad.Writer.Trans
910
) where
1011

1112
import Prelude
1213

1314
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
14-
import Control.Monad.Writer.Trans (WriterT, runWriterT, mapWriterT)
15+
import Control.Monad.Writer.Trans (class MonadTrans, WriterT(..), execWriterT, lift, mapWriterT, runWriterT)
1516

1617
import Data.Identity (Identity(..), runIdentity)
1718
import Data.Tuple (Tuple, snd)

src/Control/Monad/Writer/Trans.purs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ import Control.Alt (class Alt, (<|>))
1616
import Control.Alternative (class Alternative)
1717
import Control.Monad.Cont.Class (class MonadCont, callCC)
1818
import Control.Monad.Eff.Class (class MonadEff, liftEff)
19-
import Control.Monad.Error.Class (class MonadError, catchError, catchJust, throwError)
20-
import Control.Monad.Reader.Class (class MonadReader, ask, local, reader)
21-
import Control.Monad.Rec.Class (class MonadRec, forever, tailRec, tailRecM, tailRecM2, tailRecM3)
22-
import Control.Monad.State.Class (class MonadState, get, gets, modify, put, state)
19+
import Control.Monad.Error.Class (class MonadError, catchError, throwError)
20+
import Control.Monad.Reader.Class (class MonadReader, ask, local)
21+
import Control.Monad.Rec.Class (class MonadRec, tailRecM)
22+
import Control.Monad.State.Class (class MonadState, state)
2323
import Control.Monad.Trans (class MonadTrans, lift)
2424
import Control.Monad.Writer.Class (class MonadWriter, censor, listen, listens, pass, tell, writer)
2525
import Control.MonadPlus (class MonadPlus)

test/Test/Main.purs

Lines changed: 13 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,18 @@ import Prelude
55
import Control.Monad.Eff (Eff)
66
import Control.Monad.Eff.Console (CONSOLE)
77

8+
import Example.Cont as Cont
9+
import Example.Reader as Reader
10+
import Example.State as State
11+
import Example.StateEff as StateEff
12+
import Example.Writer as Writer
13+
import Example.RWS as RWS
14+
815
main :: Eff (console :: CONSOLE) Unit
916
main = do
10-
Example.Cont.main
11-
Example.Reader.main
12-
Example.State.main
13-
Example.StateEff.main
14-
Example.Writer.main
15-
Example.RWS.main
17+
Cont.main
18+
Reader.main
19+
State.main
20+
StateEff.main
21+
Writer.main
22+
RWS.main

0 commit comments

Comments
 (0)