67d8b0b · rowtype-yoga/purescript-native

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

on golang help sign in

Permit overlap of instances introduced by module imports

67d8b0bPhil Freeman13 years ago

prelude/prelude.purs+5

@@ -75,6 +75,11 @@ module Prelude where

75 return :: forall a. a -> m a

76 (>>=) :: forall a b. m a -> (a -> m b) -> m b

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+

78 ap :: forall m a b. (Monad m) => m (a -> b) -> m a -> m b

83 ap :: forall m a b. (Monad m) => m (a -> b) -> m a -> m b

79 ap f a = do

84 ap f a = do

80 f' <- f

85 f' <- f

src/Language/PureScript/TypeChecker/Types.hs+2−1

@@ -270,7 +270,7 @@ replaceTypeClassDictionaries mn = everywhereM' (mkM go)

270-- A simplified representation of expressions which are used to represent type

271-- class dictionaries at runtime, which can be compared for equality

272--

273−data DictionaryValue

273+data DictionaryValue

274 -- |

275 -- A dictionary which is brought into scope by a local constraint

276 --

@@ -1010,3 +1010,4 @@ subsumes' val ty1 ty2 = do

1010 return val

1011

1012

1013+