doc whitespace

[ghc-base.git] / GHC / Read.lhs

diff --git a/GHC/Read.lhs b/GHC/Read.lhs
index 5ec8932..f99e2df 100644 (file)
--- a/GHC/Read.lhs
+++ b/GHC/Read.lhs
@@ -1,5 +1,5 @@
 \begin{code}
-{-# OPTIONS_GHC -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -XNoImplicitPrelude #-}
 {-# OPTIONS_HADDOCK hide #-}
 -----------------------------------------------------------------------------
 -- |
@@ -22,12 +22,6 @@ module GHC.Read
   -- ReadS type
   , ReadS      -- :: *; = String -> [(a,String)]
 
-  -- utility functions
-  , reads      -- :: Read a => ReadS a
-  , readp      -- :: Read a => ReadP a
-  , readEither -- :: Read a => String -> Either String a
-  , read       -- :: Read a => String -> a
-
   -- H98 compatibility
   , lex         -- :: ReadS String
   , lexLitChar  -- :: ReadS String
@@ -44,6 +38,9 @@ module GHC.Read
 
   -- Temporary
   , readParen
+
+  -- XXX Can this be removed?
+  , readp
   )
  where
 
@@ -64,14 +61,13 @@ import qualified Text.Read.Lex as L
 import Text.ParserCombinators.ReadPrec
 
 import Data.Maybe
-import Data.Either
 
 #ifndef __HADDOCK__
 import {-# SOURCE #-} GHC.Unicode       ( isDigit )
 #endif
 import GHC.Num
 import GHC.Real
-import GHC.Float
+import GHC.Float ()
 import GHC.Show
 import GHC.Base
 import GHC.Arr
@@ -225,33 +221,6 @@ readListPrecDefault :: Read a => ReadPrec [a]
 readListPrecDefault = list readPrec
 
 ------------------------------------------------------------------------
--- utility functions
-
--- | equivalent to 'readsPrec' with a precedence of 0.
-reads :: Read a => ReadS a
-reads = readsPrec minPrec
-
-readp :: Read a => ReadP a
-readp = readPrec_to_P readPrec minPrec
-
-readEither :: Read a => String -> Either String a
-readEither s =
-  case [ x | (x,"") <- readPrec_to_S read' minPrec s ] of
-    [x] -> Right x
-    []  -> Left "Prelude.read: no parse"
-    _   -> Left "Prelude.read: ambiguous parse"
- where
-  read' =
-    do x <- readPrec
-       lift P.skipSpaces
-       return x
-
--- | The 'read' function reads input from a string, which must be
--- completely consumed by the input process.
-read :: Read a => String -> a
-read s = either error id (readEither s)
-
-------------------------------------------------------------------------
 -- H98 compatibility
 
 -- | The 'lex' function reads a single lexeme from the input, discarding
@@ -448,23 +417,6 @@ instance Read a => Read (Maybe a) where
   readListPrec = readListPrecDefault
   readList     = readListDefault
 
-instance (Read a, Read b) => Read (Either a b) where
-  readPrec =
-    parens
-    ( prec appPrec
-      ( do L.Ident "Left" <- lexP
-           x            <- step readPrec
-           return (Left x)
-       +++
-        do L.Ident "Right" <- lexP
-           y             <- step readPrec
-           return (Right y)
-      )
-    )
-
-  readListPrec = readListPrecDefault
-  readList     = readListDefault
-
 instance Read a => Read [a] where
   readPrec     = readListPrec
   readListPrec = readListPrecDefault
@@ -473,9 +425,9 @@ instance Read a => Read [a] where
 instance  (Ix a, Read a, Read b) => Read (Array a b)  where
     readPrec = parens $ prec appPrec $
                do L.Ident "array" <- lexP
-                  bounds <- step readPrec
+                  theBounds <- step readPrec
                   vals   <- step readPrec
-                  return (array bounds vals)
+                  return (array theBounds vals)
 
     readListPrec = readListPrecDefault
     readList     = readListDefault
@@ -714,3 +666,11 @@ instance (Read a, Read b, Read c, Read d, Read e, Read f, Read g, Read h,
   readListPrec = readListPrecDefault
   readList     = readListDefault
 \end{code}
+
+\begin{code}
+-- XXX Can this be removed?
+
+readp :: Read a => ReadP a
+readp = readPrec_to_P readPrec minPrec
+\end{code}
+