40b1786 · jsaddle · git.iko.soy

git.iko.soy/jsaddle

add MonadThrow/MonadCatch/MonadMask instances to JSM

commit40b17863a3d4de7346e80937931cc04c8b4b3cd6 authorFrancesco Mazzoli <f@mazzo.li> dateSun 1 Oct 2017, 19:03 (9 years ago) parentb0de8bf

2 files changed+4−2

unifiedsplit

jsaddle/jsaddle.cabal+2−1

@@ -48,7 +48,8 @@ library

4848 stm >=2.4.4 && <2.5,

4949 time >=1.5.0.1 && <1.9,

5050 unordered-containers >=0.2 && <0.3,

51− vector >=0.10 && <0.13

51+ vector >=0.10 && <0.13,

52+ exceptions >=0.8 && <0.9

5253 exposed-modules:

5354 Data.JSString

5455 Data.JSString.Internal

jsaddle/src/Language/Javascript/JSaddle/Types.hs+2−1

@@ -89,6 +89,7 @@ import GHCJS.Nullable (Nullable(..))

8989import GHCJS.Prim.Internal (JSVal(..), JSValueRef)

9090import Data.JSString.Internal.Type (JSString(..))

9191import Control.DeepSeq (NFData(..))

92+import Control.Monad.Catch (MonadThrow, MonadCatch, MonadMask)

9293import Control.Monad.Trans.Cont (ContT(..))

9394import Control.Monad.Trans.Error (Error(..), ErrorT(..))

9495import Control.Monad.Trans.Except (ExceptT(..))

@@ -157,7 +158,7 @@ data JSContextRef = JSContextRef {

157158type JSM = IO

158159#else

159160newtype JSM a = JSM { unJSM :: ReaderT JSContextRef IO a }

160− deriving (Functor, Applicative, Monad, MonadIO, MonadFix)

161+ deriving (Functor, Applicative, Monad, MonadIO, MonadFix, MonadCatch, MonadThrow, MonadMask)

161162#endif

162163

163164