summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libraries/base/Control/Arrow.hs2
-rw-r--r--libraries/base/Control/Monad/Error.hs4
-rw-r--r--libraries/base/Control/Monad/Fix.hs11
-rw-r--r--libraries/base/Control/Monad/Identity.hs10
-rw-r--r--libraries/base/Control/Monad/Monoid.hs8
-rw-r--r--libraries/base/Control/Monad/RWS.hs11
-rw-r--r--libraries/base/Control/Monad/Reader.hs11
-rw-r--r--libraries/base/Control/Monad/State.hs11
-rw-r--r--libraries/base/Control/Monad/Trans.hs8
-rw-r--r--libraries/base/Control/Monad/Writer.hs11
-rw-r--r--libraries/base/Data/Array/IO.hs2
-rw-r--r--libraries/base/Data/Array/ST.hs2
-rw-r--r--libraries/base/Data/FiniteMap.hs2
-rw-r--r--libraries/base/Data/PackedString.hs2
-rw-r--r--libraries/base/Debug/QuickCheck.hs2
-rw-r--r--libraries/base/Debug/QuickCheck/Batch.hs2
-rw-r--r--libraries/base/Debug/QuickCheck/Poly.hs2
-rw-r--r--libraries/base/Debug/QuickCheck/Utils.hs2
-rw-r--r--libraries/base/GHC/IOBase.lhs15
-rw-r--r--libraries/base/System/Console/GetOpt.hs2
-rw-r--r--libraries/base/System/Info.hs2
-rw-r--r--libraries/base/Text/PrettyPrint/HughesPJ.hs6
22 files changed, 68 insertions, 60 deletions
diff --git a/libraries/base/Control/Arrow.hs b/libraries/base/Control/Arrow.hs
index 35cc00de97..04f31a6df5 100644
--- a/libraries/base/Control/Arrow.hs
+++ b/libraries/base/Control/Arrow.hs
@@ -20,6 +20,8 @@
module Control.Arrow where
+import Prelude
+
import Control.Monad
import Control.Monad.Fix
diff --git a/libraries/base/Control/Monad/Error.hs b/libraries/base/Control/Monad/Error.hs
index 6f3967ab6e..6df213ea61 100644
--- a/libraries/base/Control/Monad/Error.hs
+++ b/libraries/base/Control/Monad/Error.hs
@@ -10,9 +10,9 @@
--
-- The Error monad.
--
--- Rendered by Michael Weber <michael.weber@post.rwth-aachen.de>,
+-- Rendered by Michael Weber <mailto:michael.weber@post.rwth-aachen.de>,
-- inspired by the Haskell Monad Template Library from
--- \A[HREF="http://www.cse.ogi.edu/~andy"]{Andy Gill}}
+-- Andy Gill (<http://www.cse.ogi.edu/~andy>)
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Control/Monad/Fix.hs b/libraries/base/Control/Monad/Fix.hs
index 1122588192..53d5c424ab 100644
--- a/libraries/base/Control/Monad/Fix.hs
+++ b/libraries/base/Control/Monad/Fix.hs
@@ -11,12 +11,11 @@
--
-- The Fix monad.
--
--- Inspired by the paper:
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
---
+-- Inspired by the paper
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.Fix (
diff --git a/libraries/base/Control/Monad/Identity.hs b/libraries/base/Control/Monad/Identity.hs
index e86da0b55d..282eddbeaf 100644
--- a/libraries/base/Control/Monad/Identity.hs
+++ b/libraries/base/Control/Monad/Identity.hs
@@ -11,11 +11,11 @@
--
-- The Identity monad.
--
--- Inspired by the paper:
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- Inspired by the paper
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Control/Monad/Monoid.hs b/libraries/base/Control/Monad/Monoid.hs
index 23b10b39cb..f892455b2b 100644
--- a/libraries/base/Control/Monad/Monoid.hs
+++ b/libraries/base/Control/Monad/Monoid.hs
@@ -12,10 +12,10 @@
-- Declaration of the Monoid class,and instances for list and functions
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.Monoid (
diff --git a/libraries/base/Control/Monad/RWS.hs b/libraries/base/Control/Monad/RWS.hs
index a494ef0e0d..7f7f98bb4b 100644
--- a/libraries/base/Control/Monad/RWS.hs
+++ b/libraries/base/Control/Monad/RWS.hs
@@ -7,16 +7,15 @@
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--- Portability : non-portable ( requires mulit-parameter type classes,
--- requires functional dependencies )
+-- Portability : non-portable ( mulit-param classes, functional dependencies )
--
-- Declaration of the MonadRWS class.
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.RWS (
diff --git a/libraries/base/Control/Monad/Reader.hs b/libraries/base/Control/Monad/Reader.hs
index 895740404b..758a19dfe5 100644
--- a/libraries/base/Control/Monad/Reader.hs
+++ b/libraries/base/Control/Monad/Reader.hs
@@ -7,16 +7,15 @@
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--- Portability : non-portable ( requires mulit-parameter type classes,
--- requires functional dependencies )
+-- Portability : non-portable ( mulit-param classes, functional dependencies )
--
-- Declaration of the Monoid class,and instances for list and functions
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.Reader (
diff --git a/libraries/base/Control/Monad/State.hs b/libraries/base/Control/Monad/State.hs
index 878b83f699..2353d76dec 100644
--- a/libraries/base/Control/Monad/State.hs
+++ b/libraries/base/Control/Monad/State.hs
@@ -7,16 +7,15 @@
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--- Portability : non-portable ( requires mulit-parameter type classes,
--- requires functional dependencies )
+-- Portability : non-portable ( mulit-param classes, functional dependencies )
--
-- State monads.
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.State (
diff --git a/libraries/base/Control/Monad/Trans.hs b/libraries/base/Control/Monad/Trans.hs
index 81ff397cae..929b242fa6 100644
--- a/libraries/base/Control/Monad/Trans.hs
+++ b/libraries/base/Control/Monad/Trans.hs
@@ -12,10 +12,10 @@
-- The MonadTrans class.
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.Trans (
diff --git a/libraries/base/Control/Monad/Writer.hs b/libraries/base/Control/Monad/Writer.hs
index e79abb95e6..af7add698e 100644
--- a/libraries/base/Control/Monad/Writer.hs
+++ b/libraries/base/Control/Monad/Writer.hs
@@ -7,16 +7,15 @@
--
-- Maintainer : libraries@haskell.org
-- Stability : experimental
--- Portability : non-portable ( requires mulit-parameter type classes,
--- requires functional dependencies )
+-- Portability : non-portable ( mulit-param classes, functional dependencies )
--
-- The MonadWriter class.
--
-- Inspired by the paper
--- \em{Functional Programming with Overloading and
--- Higher-Order Polymorphism},
--- \A[HREF="http://www.cse.ogi.edu/~mpj"]{Mark P Jones},
--- Advanced School of Functional Programming, 1995.}
+-- /Functional Programming with Overloading and
+-- Higher-Order Polymorphism/,
+-- Mark P Jones (<http://www.cse.ogi.edu/~mpj>)
+-- Advanced School of Functional Programming, 1995.
-----------------------------------------------------------------------------
module Control.Monad.Writer (
diff --git a/libraries/base/Data/Array/IO.hs b/libraries/base/Data/Array/IO.hs
index b47e147dc2..5c6e361a59 100644
--- a/libraries/base/Data/Array/IO.hs
+++ b/libraries/base/Data/Array/IO.hs
@@ -9,7 +9,7 @@
-- Stability : experimental
-- Portability : non-portable
--
--- Mutable boxed/unboxed arrays in the IO monad.
+-- Mutable boxed and unboxed arrays in the IO monad.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Data/Array/ST.hs b/libraries/base/Data/Array/ST.hs
index d8c302848c..e71dece303 100644
--- a/libraries/base/Data/Array/ST.hs
+++ b/libraries/base/Data/Array/ST.hs
@@ -8,7 +8,7 @@
-- Stability : experimental
-- Portability : non-portable
--
--- Mutable boxed/unboxed arrays in the ST monad.
+-- Mutable boxed and unboxed arrays in the ST monad.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Data/FiniteMap.hs b/libraries/base/Data/FiniteMap.hs
index a44bb36f9f..88279bda85 100644
--- a/libraries/base/Data/FiniteMap.hs
+++ b/libraries/base/Data/FiniteMap.hs
@@ -201,7 +201,7 @@ emptyFM
bottom = panic "emptyFM"
-}
--- #define EmptyFM (Branch _ _ IF_GHC(0#,0) _ _)
+-- #define EmptyFM (Branch _ _ IF_GHC(0#,0) _ _)
unitFM key elt = Branch key elt IF_GHC(1#,1) emptyFM emptyFM
diff --git a/libraries/base/Data/PackedString.hs b/libraries/base/Data/PackedString.hs
index cc5240eae9..fd4528b552 100644
--- a/libraries/base/Data/PackedString.hs
+++ b/libraries/base/Data/PackedString.hs
@@ -10,7 +10,7 @@
--
-- The PackedString type, and associated operations.
--
--- Original GHC implementation by Bryan O'Sullivan,
+-- Original GHC implementation by Bryan O\'Sullivan,
-- rewritten to use UArray by Simon Marlow.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Debug/QuickCheck.hs b/libraries/base/Debug/QuickCheck.hs
index 7bf87f2015..99af89bbe5 100644
--- a/libraries/base/Debug/QuickCheck.hs
+++ b/libraries/base/Debug/QuickCheck.hs
@@ -67,6 +67,8 @@ module Debug.QuickCheck
)
where
+import Prelude
+
import System.Random
import Data.List( group, sort, intersperse )
import Control.Monad( liftM2, liftM3, liftM4 )
diff --git a/libraries/base/Debug/QuickCheck/Batch.hs b/libraries/base/Debug/QuickCheck/Batch.hs
index 66b010911d..1b5cafaacd 100644
--- a/libraries/base/Debug/QuickCheck/Batch.hs
+++ b/libraries/base/Debug/QuickCheck/Batch.hs
@@ -88,6 +88,8 @@ module Debug.QuickCheck.Batch
, bottom -- :: a {- _|_ -}
) where
+import Prelude
+
import System.Random
import Control.Concurrent
import Control.Exception hiding (catch, evaluate)
diff --git a/libraries/base/Debug/QuickCheck/Poly.hs b/libraries/base/Debug/QuickCheck/Poly.hs
index 82bda15c89..f254432a0a 100644
--- a/libraries/base/Debug/QuickCheck/Poly.hs
+++ b/libraries/base/Debug/QuickCheck/Poly.hs
@@ -26,6 +26,8 @@ module Debug.QuickCheck.Poly
, OrdGAMMA
) where
+import Prelude
+
import Debug.QuickCheck
import Debug.QuickCheck.Utils
diff --git a/libraries/base/Debug/QuickCheck/Utils.hs b/libraries/base/Debug/QuickCheck/Utils.hs
index 4705615bb4..8d22c272b8 100644
--- a/libraries/base/Debug/QuickCheck/Utils.hs
+++ b/libraries/base/Debug/QuickCheck/Utils.hs
@@ -20,6 +20,8 @@ module Debug.QuickCheck.Utils
, isTotalOrder
) where
+import Prelude
+
import Debug.QuickCheck
isAssociativeBy :: (Show a,Testable prop)
diff --git a/libraries/base/GHC/IOBase.lhs b/libraries/base/GHC/IOBase.lhs
index 9c2c034418..3e6462ab14 100644
--- a/libraries/base/GHC/IOBase.lhs
+++ b/libraries/base/GHC/IOBase.lhs
@@ -24,7 +24,10 @@ import Data.Maybe ( Maybe(..) )
import GHC.Show
import GHC.List
import GHC.Read
+
+#ifndef __HADDOCK__
import {-# SOURCE #-} Data.Dynamic
+#endif
-- ---------------------------------------------------------------------------
-- The IO Monad
@@ -270,22 +273,22 @@ type FilePath = String
-- effects. For output, items are written out from the internal
-- buffer according to the buffer mode:
--
--- * line-buffering the entire output buffer is written
+-- o line-buffering the entire output buffer is written
-- out whenever a newline is output, the output buffer overflows,
-- a flush is issued, or the handle is closed.
--
--- * block-buffering the entire output buffer is written out whenever
+-- o block-buffering the entire output buffer is written out whenever
-- it overflows, a flush is issued, or the handle
-- is closed.
--
--- * no-buffering output is written immediately, and never stored
+-- o no-buffering output is written immediately, and never stored
-- in the output buffer.
--
-- The output buffer is emptied as soon as it has been written out.
-- Similarly, input occurs according to the buffer mode for handle {\em hdl}.
--- * line-buffering when the input buffer for the handle is not empty,
+-- o line-buffering when the input buffer for the handle is not empty,
-- the next item is obtained from the buffer;
-- otherwise, when the input buffer is empty,
-- characters up to and including the next newline
@@ -293,10 +296,10 @@ type FilePath = String
-- are available until the newline character is
-- available.
--
--- * block-buffering when the input buffer for the handle becomes empty,
+-- o block-buffering when the input buffer for the handle becomes empty,
-- the next block of data is read into this buffer.
--
--- * no-buffering the next input item is read and returned.
+-- o no-buffering the next input item is read and returned.
-- For most implementations, physical files will normally be block-buffered
-- and terminals will normally be line-buffered. (the IO interface provides
diff --git a/libraries/base/System/Console/GetOpt.hs b/libraries/base/System/Console/GetOpt.hs
index ca322861af..72ffea2c58 100644
--- a/libraries/base/System/Console/GetOpt.hs
+++ b/libraries/base/System/Console/GetOpt.hs
@@ -8,7 +8,7 @@
-- Stability : experimental
-- Portability : portable
--
--- A Haskell port of GNU's getopt library
+-- A Haskell port of the GNU getopt library
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/System/Info.hs b/libraries/base/System/Info.hs
index fce5b4398e..a064991ff7 100644
--- a/libraries/base/System/Info.hs
+++ b/libraries/base/System/Info.hs
@@ -9,7 +9,7 @@
-- Portability : portable
--
-- Misc information about the characteristics of the host
--- architecture/machine lucky enough to run your program.
+-- architecture\/machine lucky enough to run your program.
--
-----------------------------------------------------------------------------
diff --git a/libraries/base/Text/PrettyPrint/HughesPJ.hs b/libraries/base/Text/PrettyPrint/HughesPJ.hs
index 0bcfbbb524..5ad32c08cb 100644
--- a/libraries/base/Text/PrettyPrint/HughesPJ.hs
+++ b/libraries/base/Text/PrettyPrint/HughesPJ.hs
@@ -8,12 +8,12 @@
-- Stability : provisional
-- Portability : portable
--
--- John Hughes's and Simon Peyton Jones's Pretty Printer Combinators
+-- John Hughes\'s and Simon Peyton Jones\'s Pretty Printer Combinators
--
--- Based on "The Design of a Pretty-printing Library"
+-- Based on /The Design of a Pretty-printing Library/
-- in Advanced Functional Programming,
-- Johan Jeuring and Erik Meijer (eds), LNCS 925
--- http://www.cs.chalmers.se/~rjmh/Papers/pretty.ps
+-- <http://www.cs.chalmers.se/~rjmh/Papers/pretty.ps>
--
-- Heavily modified by Simon Peyton Jones, Dec 96
--