diff --git a/bower.json b/bower.json index b81cb2b..b589d1a 100644 --- a/bower.json +++ b/bower.json @@ -23,12 +23,9 @@ "tests" ], "dependencies": { - "purescript-prelude": "^2.0.0", - "purescript-aff": "^2.0.0", - "purescript-lists": "^3.2.0", - "purescript-foldable-traversable": "^2.0.0" - }, - "devDependencies": { - "purescript-psci-support": "^2.0.0" + "purescript-prelude": "^3.0.0", + "purescript-aff": "^3.0.0", + "purescript-lists": "^4.0.0", + "purescript-foldable-traversable": "^3.0.0" } } diff --git a/package.json b/package.json index f0699a0..15a18e6 100644 --- a/package.json +++ b/package.json @@ -8,9 +8,9 @@ "test": "pulp test" }, "dependencies": { - "purescript": "^0.10.2", - "purescript-psa": "^0.4.0", + "purescript": "^0.11.1", + "purescript-psa": "^0.5.0", "rimraf": "^2.5.4", - "pulp": "^10.0.0" + "pulp": "^11.0.0" } } diff --git a/src/Control/Monad/Aff/Bus.purs b/src/Control/Monad/Aff/Bus.purs index 0cae5cd..fc008c3 100644 --- a/src/Control/Monad/Aff/Bus.purs +++ b/src/Control/Monad/Aff/Bus.purs @@ -42,7 +42,7 @@ import Data.Tuple (Tuple(..)) data Cap -data Bus (r ∷ # *) a = Bus (AVar a) (AVar (List (AVar a))) +data Bus (r ∷ # Type) a = Bus (AVar a) (AVar (List (AVar a))) type BusR = BusR' () @@ -59,7 +59,7 @@ make ∷ ∀ eff a. AffAVar eff (BusRW a) make = do cell ∷ AVar a ← makeVar consumers ∷ AVar (List (AVar a)) ← makeVar' mempty - forkAff $ forever do + _ ← forkAff $ forever do res ← takeVar cell vars ← takeVar consumers putVar consumers mempty diff --git a/test/Main.purs b/test/Main.purs index 5d4dfe9..b87be33 100644 --- a/test/Main.purs +++ b/test/Main.purs @@ -25,7 +25,6 @@ import Control.Monad.Eff (Eff) import Control.Monad.Eff.Console (CONSOLE) import Control.Monad.Eff.Exception (EXCEPTION, error, message) import Control.Monad.Error.Class (throwError) -import Control.Monad.Rec.Class (forever) import Data.Either (Either(..)) type Effects eff = @@ -53,8 +52,8 @@ test_readWrite = do modifyVar (_ + n) avar proc - forkAff proc - forkAff proc + void $ forkAff proc + void $ forkAff proc Bus.write 1 bus Bus.write 2 bus @@ -64,7 +63,7 @@ test_readWrite = do assert <<< eq 212 =<< peekVar avar log "OK" -main ∷ Eff (Effects (err ∷ EXCEPTION)) Unit +main ∷ Eff (Effects (exception ∷ EXCEPTION)) Unit main = void $ launchAff do log "Testing read/write/kill..." test_readWrite