Permit overlap of instances introduced by module imports
commit67d8b0b3957acefd17b52970716a328a7b5fb29b
authorPhil Freeman <paf31@cantab.net>
dateThu 3 Apr 2014, 17:06 (13 years ago)
parent571af15
prelude/prelude.purs+5
@@ -75,6 +75,11 @@ module Prelude where
7575 return :: forall a. a -> m a
7676 (>>=) :: forall a b. m a -> (a -> m b) -> m b
7777
78+ liftM1 :: forall m a b. (Monad m) => (a -> b) -> m a -> m b
79+ liftM1 f a = do
80+ a' <- a
81+ return (f a')
82+
7883 ap :: forall m a b. (Monad m) => m (a -> b) -> m a -> m b
7984 ap f a = do
8085 f' <- f
src/Language/PureScript/TypeChecker/Types.hs+2−1
@@ -270,7 +270,7 @@ replaceTypeClassDictionaries mn = everywhereM' (mkM go)
270270-- A simplified representation of expressions which are used to represent type
271271-- class dictionaries at runtime, which can be compared for equality
272272--
273−data DictionaryValue
273+data DictionaryValue
274274 -- |
275275 -- A dictionary which is brought into scope by a local constraint
276276 --
@@ -1010,3 +1010,4 @@ subsumes' val ty1 ty2 = do
10101010 return val
10111011
10121012
1013+