From 3b8746d947788e5286f5b3dd1fb0929af109fe64 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 4 Aug 2008 00:41:47 +0000 Subject: [PATCH] Change some imports and derive Show (Either a b) rather than writing it by hand in GHC.Show --- Data/Either.hs | 3 ++- GHC/Show.lhs | 9 --------- 2 files changed, 2 insertions(+), 10 deletions(-) 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} -- 1.7.10.4