From: Ian Lynagh <igloo@earth.li>
Date: Mon, 4 Aug 2008 00:41:47 +0000 (+0000)
Subject: Change some imports and derive Show (Either a b)
X-Git-Tag: 6_10_branch_has_been_forked~94
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=3b8746d947788e5286f5b3dd1fb0929af109fe64;p=ghc-base.git

Change some imports and derive Show (Either a b)
rather than writing it by hand in GHC.Show
---

diff --git a/Data/Either.hs b/Data/Either.hs
index 0bed290..dbed24b 100644
--- a/Data/Either.hs
+++ b/Data/Either.hs
@@ -25,6 +25,7 @@ import Data.Tuple ()
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.Base
+import GHC.Show
 
 {-
 -- just for testing
@@ -41,7 +42,7 @@ either correct or an error; by convention, the 'Left' constructor is
 used to hold an error value and the 'Right' constructor is used to
 hold a correct value (mnemonic: \"right\" also means \"correct\").
 -}
-data  Either a b  =  Left a | Right b   deriving (Eq, Ord )
+data  Either a b  =  Left a | Right b   deriving (Eq, Ord, Show)
 
 -- | Case analysis for the 'Either' type.
 -- If the value is @'Left' a@, apply the first function to @a@;
diff --git a/GHC/Show.lhs b/GHC/Show.lhs
index 3eaf04b..a00ff48 100644
--- a/GHC/Show.lhs
+++ b/GHC/Show.lhs
@@ -35,7 +35,6 @@ module GHC.Show
 
 import GHC.Base
 import Data.Maybe
-import Data.Either
 import GHC.List ( (!!), foldr1
 #ifdef USE_REPORT_PRELUDE
                 , concatMap
@@ -203,14 +202,6 @@ instance Show a => Show (Maybe a) where
                           = (showParen (p > appPrec) $ 
                              showString "Just " . 
                              showsPrec appPrec1 x) s
-
-instance (Show a, Show b) => Show (Either a b) where
-    showsPrec p e s =
-       (showParen (p > appPrec) $
-        case e of
-         Left  a -> showString "Left "  . showsPrec appPrec1 a
-         Right b -> showString "Right " . showsPrec appPrec1 b)
-       s
 \end{code}