1912dfe · rowtype-yoga/purescript-native

git.iko.soy/rowtype-yoga/purescript-native

GHC <= 7.10

commit1912dfed5df4839c7bfec5c57d3e8aa35370ea99 authorPhil Freeman <paf31@cantab.net> dateWed 11 Nov 2015, 21:32 (11 years ago) parentf8d6c48

2 files changed+3−3

unifiedsplit

src/Language/PureScript/Errors.hs+1−1

@@ -944,7 +944,7 @@ renderBox = unlines . map trimEnd . lines . Box.render

944944rethrow :: (MonadError e m) => (e -> e) -> m a -> m a

945945rethrow f = flip catchError $ \e -> throwError (f e)

946946

947−reifyErrors :: (MonadError e m) => m a -> m (Either e a)

947+reifyErrors :: (Functor m, MonadError e m) => m a -> m (Either e a)

948948reifyErrors ma = catchError (fmap Right ma) (return . Left)

949949

950950reflectErrors :: (MonadError e m) => m (Either e a) -> m a

src/Language/PureScript/TypeChecker/Monad.hs+2−2

@@ -211,14 +211,14 @@ freshDictionaryName = do

211211

212212-- | Run a computation in the substitution monad, generating a return value and the final substitution.

213213liftUnify ::

214− (MonadState CheckState m, MonadWriter MultipleErrors m, MonadError MultipleErrors m) =>

214+ (Functor m, MonadState CheckState m, MonadWriter MultipleErrors m, MonadError MultipleErrors m) =>

215215 m a ->

216216 m (a, Substitution)

217217liftUnify = liftUnifyWarnings (const id)

218218

219219-- | Run a computation in the substitution monad, generating a return value, the final substitution and updating warnings values.

220220liftUnifyWarnings ::

221− (MonadState CheckState m, MonadWriter MultipleErrors m, MonadError MultipleErrors m) =>

221+ (Functor m, MonadState CheckState m, MonadWriter MultipleErrors m, MonadError MultipleErrors m) =>

222222 (Substitution -> ErrorMessage -> ErrorMessage) ->

223223 m a ->

224224 m (a, Substitution)