X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Text%2FRead.hs;h=16a4d158eeb701b09d543019d768c866bbc4d0e5;hb=3457025838609e26918bb0cf5c16393d3bb5b69b;hp=47813eb424c37b8f4edd052b3334d005189bcd8d;hpb=7f1f4e7a695c402ddd3a1dc2cc7114e649a78ebc;p=ghc-base.git

diff --git a/Text/Read.hs b/Text/Read.hs
index 47813eb..16a4d15 100644
--- a/Text/Read.hs
+++ b/Text/Read.hs
@@ -1,32 +1,59 @@
-{-# OPTIONS -fno-implicit-prelude #-}
+{-# OPTIONS_GHC -fno-implicit-prelude #-}
 -----------------------------------------------------------------------------
--- 
+-- |
 -- Module      :  Text.Read
 -- Copyright   :  (c) The University of Glasgow 2001
--- License     :  BSD-style (see the file libraries/core/LICENSE)
+-- License     :  BSD-style (see the file libraries/base/LICENSE)
 -- 
 -- Maintainer  :  libraries@haskell.org
 -- Stability   :  provisional
--- Portability :  portable
+-- Portability :  non-portable (uses Text.ParserCombinators.ReadP)
 --
--- $Id: Read.hs,v 1.1 2001/06/28 14:15:04 simonmar Exp $
+-- Converting strings to values.
 --
--- Exiting the program.
+-- The "Text.Read" library is the canonical library to import for
+-- 'Read'-class facilities.  For GHC only, it offers an extended and much
+-- improved 'Read' class, which constitutes a proposed alternative to the 
+-- Haskell 98 'Read'.  In particular, writing parsers is easier, and
+-- the parsers are much more efficient.
 --
 -----------------------------------------------------------------------------
 
 module Text.Read (
+   -- * The 'Read' class
+   Read(..),		-- The Read class
    ReadS, 		-- String -> Maybe (a,String)
-   Read(
-      readsPrec,	-- :: Int -> ReadS a
-      readList		-- :: ReadS [a]
-    ),
+
+   -- * Haskell 98 functions
    reads,		-- :: (Read a) => ReadS a
    read,		-- :: (Read a) => String -> a
    readParen, 		-- :: Bool -> ReadS a -> ReadS a
    lex,			-- :: ReadS String
+
+#if defined(__GLASGOW_HASKELL__) || defined(__HUGS__)
+   -- * New parsing functions
+   module Text.ParserCombinators.ReadPrec,
+   L.Lexeme(..),	
+   lexP,		-- :: ReadPrec Lexeme
+#endif
+#ifdef __GLASGOW_HASKELL__
+   readListDefault,	-- :: Read a => ReadS [a]
+   readListPrecDefault,	-- :: Read a => ReadPrec [a]
+#endif
+
  ) where
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Read
 #endif   
+#if defined(__GLASGOW_HASKELL__) || defined(__HUGS__)
+import Text.ParserCombinators.ReadPrec
+import qualified Text.Read.Lex as L
+#endif   
+
+#ifdef __HUGS__
+-- copied from GHC.Read
+
+lexP :: ReadPrec L.Lexeme
+lexP = lift L.lex
+#endif