[project @ 2005-03-15 13:38:27 by simonmar]

[ghc-base.git] / Data / Maybe.hs

diff --git a/Data/Maybe.hs b/Data/Maybe.hs
index abb1c19..0e8bef5 100644 (file)
--- a/Data/Maybe.hs
+++ b/Data/Maybe.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Maybe
@@ -6,7 +6,7 @@
 -- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  libraries@haskell.org
--- Stability   :  experimental
+-- Stability   :  stable
 -- Portability :  portable
 --
 -- The Maybe type, and associated operations.
@@ -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
@@ -128,7 +128,7 @@ listToMaybe           :: [a] -> Maybe a
 listToMaybe []        =  Nothing
 listToMaybe (a:_)     =  Just a
 
--- | The 'catMaybes' function takes a list of "Maybe's and returns
+-- | The 'catMaybes' function takes a list of 'Maybe's and returns
 -- a list of all the 'Just' values. 
 catMaybes              :: [Maybe a] -> [a]
 catMaybes ls = [x | Just x <- ls]
@@ -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) =