Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/792a8b86185d4cc74bb3d0d31b481ff0de4cf0d6 >--------------------------------------------------------------- commit 792a8b86185d4cc74bb3d0d31b481ff0de4cf0d6 Author: Jose Pedro Magalhaes <[email protected]> Date: Mon May 9 09:47:29 2011 +0200 Adapt to the renaming of `Representable0` to `Generic`. >--------------------------------------------------------------- Data/Either.hs | 6 +++--- Data/Maybe.hs | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Data/Either.hs b/Data/Either.hs index 0c72f97..6ffc607 100644 --- a/Data/Either.hs +++ b/Data/Either.hs @@ -1,6 +1,6 @@ {-# LANGUAGE CPP, NoImplicitPrelude #-} #ifdef __GLASGOW_HASKELL__ -{-# LANGUAGE DeriveDataTypeable, DeriveRepresentable, StandaloneDeriving #-} +{-# LANGUAGE DeriveDataTypeable, DeriveGeneric, StandaloneDeriving #-} #endif ----------------------------------------------------------------------------- @@ -34,7 +34,7 @@ import GHC.Read #endif import Data.Typeable -import GHC.Generics (Representable0) +import GHC.Generics (Generic) #ifdef __GLASGOW_HASKELL__ {- @@ -53,7 +53,7 @@ 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, Read, Show, Representable0) + deriving (Eq, Ord, Read, Show, Generic) -- | Case analysis for the 'Either' type. -- If the value is @'Left' a@, apply the first function to @a@; diff --git a/Data/Maybe.hs b/Data/Maybe.hs index e6039f2..2f98c70 100644 --- a/Data/Maybe.hs +++ b/Data/Maybe.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE CPP, NoImplicitPrelude, DeriveRepresentable #-} +{-# LANGUAGE CPP, NoImplicitPrelude, DeriveGeneric #-} ----------------------------------------------------------------------------- -- | @@ -33,7 +33,7 @@ module Data.Maybe #ifdef __GLASGOW_HASKELL__ import GHC.Base -import GHC.Generics (Representable0) +import GHC.Generics (Generic) #endif #ifdef __NHC__ @@ -66,7 +66,7 @@ import Maybe -- error monad can be built using the 'Data.Either.Either' type. data Maybe a = Nothing | Just a - deriving (Eq, Ord, Representable0) + deriving (Eq, Ord, Generic) instance Functor Maybe where fmap _ Nothing = Nothing _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
