[project @ 2005-10-22 00:28:21 by ross]

[haskell-directory.git] / Data / Sequence.hs

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index da1163c..80c42d3 100644 (file)
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -80,19 +80,20 @@ import Prelude hiding (
        null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
        reverse)
 import qualified Data.List (foldl')
-import Control.Monad (MonadPlus(..))
+import Control.Monad (MonadPlus(..), liftM2)
 import Data.FunctorM
 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
 
 #if TESTING
-import Control.Monad (liftM, liftM2, liftM3, liftM4)
+import Control.Monad (liftM, liftM3, liftM4)
 import Test.QuickCheck
 #endif
 
@@ -150,10 +151,12 @@ 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
-               (xs,t) <- reads
+               ("fromList",s) <- lex r
+               (xs,t) <- reads s
                return (fromList xs,t)
 #endif
 
@@ -599,12 +602,17 @@ data ViewL a
        = EmptyL        -- ^ empty sequence
        | a :< Seq a    -- ^ leftmost element and the rest of the sequence
 #ifndef __HADDOCK__
+# if __GLASGOW_HASKELL__
+       deriving (Eq, Ord, Show, Read, Data)
+# else
        deriving (Eq, Ord, Show, Read)
+# endif
 #else
 instance Eq a => Eq (ViewL a)
 instance Ord a => Ord (ViewL a)
 instance Show a => Show (ViewL a)
 instance Read a => Read (ViewL a)
+instance Data a => Data (ViewL a)
 #endif
 
 INSTANCE_TYPEABLE1(ViewL,viewLTc,"ViewL")
@@ -613,6 +621,12 @@ instance Functor ViewL where
        fmap _ EmptyL           = EmptyL
        fmap f (x :< xs)        = f x :< fmap f xs
 
+instance FunctorM ViewL where
+       fmapM _ EmptyL          = return EmptyL
+       fmapM f (x :< xs)       = liftM2 (:<) (f x) (fmapM f xs)
+       fmapM_ _ EmptyL         = return ()
+       fmapM_ f (x :< xs)      = f x >> fmapM_ f xs >> return ()
+
 -- | /O(1)/. Analyse the left end of a sequence.
 viewl          ::  Seq a -> ViewL a
 viewl (Seq xs) =  case viewLTree xs of
@@ -640,12 +654,17 @@ data ViewR a
        | Seq a :> a    -- ^ the sequence minus the rightmost element,
                        -- and the rightmost element
 #ifndef __HADDOCK__
+# if __GLASGOW_HASKELL__
+       deriving (Eq, Ord, Show, Read, Data)
+# else
        deriving (Eq, Ord, Show, Read)
+# endif
 #else
 instance Eq a => Eq (ViewR a)
 instance Ord a => Ord (ViewR a)
 instance Show a => Show (ViewR a)
 instance Read a => Read (ViewR a)
+instance Data a => Data (ViewR a)
 #endif
 
 INSTANCE_TYPEABLE1(ViewR,viewRTc,"ViewR")
@@ -654,6 +673,12 @@ instance Functor ViewR where
        fmap _ EmptyR           = EmptyR
        fmap f (xs :> x)        = fmap f xs :> f x
 
+instance FunctorM ViewR where
+       fmapM _ EmptyR          = return EmptyR
+       fmapM f (xs :> x)       = liftM2 (:>) (fmapM f xs) (f x)
+       fmapM_ _ EmptyR         = return ()
+       fmapM_ f (xs :> x)      = fmapM_ f xs >> f x >> return ()
+
 -- | /O(1)/. Analyse the right end of a sequence.
 viewr          ::  Seq a -> ViewR a
 viewr (Seq xs) =  case viewRTree xs of