From 4207be3cc5026d6f41e13b55ff2295fbdd908743 Mon Sep 17 00:00:00 2001 From: Gary Burgess Date: Fri, 21 Oct 2016 01:49:29 +0100 Subject: [PATCH] Remove MonadCont instance --- src/Control/Monad/Aff.purs | 4 ---- test/Test/Main.purs | 4 +--- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/Control/Monad/Aff.purs b/src/Control/Monad/Aff.purs index 6d13d43..c2f5748 100644 --- a/src/Control/Monad/Aff.purs +++ b/src/Control/Monad/Aff.purs @@ -25,7 +25,6 @@ import Prelude import Control.Alt (class Alt) import Control.Alternative (class Alternative) import Control.Monad.Aff.Internal (AVBox, AVar, _killVar, _putVar, _takeVar, _makeVar) -import Control.Monad.Cont.Class (class MonadCont) import Control.Monad.Eff (Eff) import Control.Monad.Eff.Class (class MonadEff) import Control.Monad.Eff.Exception (Error, EXCEPTION, throwException, error) @@ -208,9 +207,6 @@ instance monadRecAff :: MonadRec (Aff e) where isLoop (Loop _) = true isLoop _ = false -instance monadContAff :: MonadCont (Aff e) where - callCC f = makeAff (\eb cb -> void $ runAff eb cb (f \a -> makeAff (\_ _ -> cb a))) - instance semigroupCanceler :: Semigroup (Canceler e) where append (Canceler f1) (Canceler f2) = Canceler (\e -> (||) <$> f1 e <*> f2 e) diff --git a/test/Test/Main.purs b/test/Test/Main.purs index 4b0f336..c3dc039 100644 --- a/test/Test/Main.purs +++ b/test/Test/Main.purs @@ -6,7 +6,6 @@ import Control.Alt ((<|>)) import Control.Monad.Aff (Aff, runAff, makeAff, launchAff, later, later', forkAff, forkAll, Canceler(..), cancel, attempt, finally, apathize) import Control.Monad.Aff.AVar (AVAR, makeVar, makeVar', putVar, modifyVar, takeVar, peekVar, killVar) import Control.Monad.Aff.Console (CONSOLE, log) -import Control.Monad.Cont.Class (callCC) import Control.Monad.Eff (Eff) import Control.Monad.Eff.Console (log) as Eff import Control.Monad.Eff.Exception (EXCEPTION, throwException, error, message, try) @@ -211,8 +210,7 @@ cancelAll n = do log ("Cancelled all: " <> show canceled) delay :: forall eff. Int -> Aff eff Unit -delay n = callCC \cont -> - later' n (cont unit) +delay n = later' n (pure unit) main :: Eff (console :: CONSOLE, avar :: AVAR, err :: EXCEPTION) Unit main = do