From: ross Date: Sat, 22 Oct 2005 00:28:21 +0000 (+0000) Subject: [project @ 2005-10-22 00:28:21 by ross] X-Git-Tag: Initial_conversion_from_CVS_complete~37 X-Git-Url: http://git.megacz.com/?p=haskell-directory.git;a=commitdiff_plain;h=68937167ecaa5ddaeb0420ad8c204902e09c508b [project @ 2005-10-22 00:28:21 by ross] define readListPrec too. --- diff --git a/Data/IntMap.hs b/Data/IntMap.hs index e6a9594..f9ee03a 100644 --- a/Data/IntMap.hs +++ b/Data/IntMap.hs @@ -147,7 +147,7 @@ import qualified List -} #if __GLASGOW_HASKELL__ -import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec) +import Text.Read import Data.Generics.Basics import Data.Generics.Instances #endif @@ -1002,6 +1002,8 @@ instance (Read e) => Read (IntMap e) where Ident "fromList" <- lexP xs <- readPrec return (fromList xs) + + readListPrec = readListPrecDefault #else readsPrec p = readParen (p > 10) $ \ r -> do ("fromList",s) <- lex r diff --git a/Data/IntSet.hs b/Data/IntSet.hs index 49ccd0f..6220827 100644 --- a/Data/IntSet.hs +++ b/Data/IntSet.hs @@ -104,7 +104,7 @@ import qualified List -} #if __GLASGOW_HASKELL__ -import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec) +import Text.Read import Data.Generics.Basics import Data.Generics.Instances #endif @@ -604,6 +604,8 @@ instance Read IntSet where Ident "fromList" <- lexP xs <- readPrec return (fromList xs) + + readListPrec = readListPrecDefault #else readsPrec p = readParen (p > 10) $ \ r -> do ("fromList",s) <- lex r diff --git a/Data/Map.hs b/Data/Map.hs index 5aeffc5..37a9695 100644 --- a/Data/Map.hs +++ b/Data/Map.hs @@ -161,7 +161,7 @@ import List(nub,sort) -} #if __GLASGOW_HASKELL__ -import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec) +import Text.Read import Data.Generics.Basics import Data.Generics.Instances #endif @@ -1314,6 +1314,8 @@ instance (Ord k, Read k, Read e) => Read (Map k e) where Ident "fromList" <- lexP xs <- readPrec return (fromList xs) + + readListPrec = readListPrecDefault #else readsPrec p = readParen (p > 10) $ \ r -> do ("fromList",s) <- lex r diff --git a/Data/Sequence.hs b/Data/Sequence.hs index 0bf80d5..80c42d3 100644 --- a/Data/Sequence.hs +++ b/Data/Sequence.hs @@ -86,7 +86,8 @@ import Data.Typeable #ifdef __GLASGOW_HASKELL__ import GHC.Exts (build) -import Text.Read (Lexeme(..), lexP, parens, prec, readPrec) +import Text.Read (Lexeme(Ident), lexP, parens, prec, + readPrec, readListPrec, readListPrecDefault) import Data.Generics.Basics (Data(..), Fixity(..), constrIndex, mkConstr, mkDataType) #endif @@ -150,6 +151,8 @@ instance Read a => Read (Seq a) where Ident "fromList" <- lexP xs <- readPrec return (fromList xs) + + readListPrec = readListPrecDefault #else readsPrec p = readParen (p > 10) $ \ r -> do ("fromList",s) <- lex r diff --git a/Data/Set.hs b/Data/Set.hs index fad370c..2029faa 100644 --- a/Data/Set.hs +++ b/Data/Set.hs @@ -123,7 +123,7 @@ import qualified List -} #if __GLASGOW_HASKELL__ -import Text.Read (Lexeme(Ident), lexP, parens, prec, readPrec) +import Text.Read import Data.Generics.Basics import Data.Generics.Instances #endif @@ -534,6 +534,8 @@ instance (Read a, Ord a) => Read (Set a) where Ident "fromList" <- lexP xs <- readPrec return (fromList xs) + + readListPrec = readListPrecDefault #else readsPrec p = readParen (p > 10) $ \ r -> do ("fromList",s) <- lex r