X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Data%2FMaybe.hs;h=0e8bef572ea0f17cf4317719fd49f472d6b2c3b1;hb=fde71f72181bed62ed528e789d6cb0366e478b0b;hp=69dd75f0cd0ca817685c2d6c2643f0ccab59a1f2;hpb=aaf764b3ad8b1816d68b5f27299eac125f08e1a5;p=ghc-base.git diff --git a/Data/Maybe.hs b/Data/Maybe.hs index 69dd75f..0e8bef5 100644 --- a/Data/Maybe.hs +++ b/Data/Maybe.hs @@ -87,7 +87,7 @@ instance Monad Maybe where -- | The 'maybe' function takes a default value, a function, and a 'Maybe' -- value. If the 'Maybe' value is 'Nothing', the function returns the -- default value. Otherwise, it applies the function to the value inside --- the 'Just' and returns that. +-- the 'Just' and returns the result. maybe :: b -> (a -> b) -> Maybe a -> b maybe n _ Nothing = n maybe _ f (Just x) = f x @@ -136,8 +136,8 @@ catMaybes ls = [x | Just x <- ls] -- | The 'mapMaybe' function is a version of 'map' which can throw -- out elements. In particular, the functional argument returns -- something of type @'Maybe' b@. If this is 'Nothing', no element --- is added on to the result list. If it just @'Just' a@, then @a@ is --- added on to the result. +-- is added on to the result list. If it just @'Just' b@, then @b@ is +-- included in the result list. mapMaybe :: (a -> Maybe b) -> [a] -> [b] mapMaybe _ [] = [] mapMaybe f (x:xs) =