[commit: base] ghc-generics1: Uncomment some code left as comment by accident (544fae1)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/544fae140183e5c887febfd0fff2b100242bbe71

>---------------------------------------------------------------

commit 544fae140183e5c887febfd0fff2b100242bbe71
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Wed Jun 6 10:41:48 2012 +0100

    Uncomment some code left as comment by accident

>---------------------------------------------------------------

 GHC/Generics.hs |   20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/GHC/Generics.hs b/GHC/Generics.hs
index 02a050b..2244253 100644
--- a/GHC/Generics.hs
+++ b/GHC/Generics.hs
@@ -28,13 +28,13 @@ module GHC.Generics  (
 
 -- We use some base types
 import GHC.Types
---import Data.Maybe ( Maybe(..) )
---import Data.Either ( Either(..) )
+import Data.Maybe ( Maybe(..) )
+import Data.Either ( Either(..) )
 
 -- Needed for instances
---import GHC.Classes ( Eq, Ord )
---import GHC.Read ( Read )
---import GHC.Show ( Show )
+import GHC.Classes ( Eq, Ord )
+import GHC.Read ( Read )
+import GHC.Show ( Show )
 
 --------------------------------------------------------------------------------
 -- Representation types
@@ -132,12 +132,12 @@ class Constructor c where
 
 -- | Datatype to represent the arity of a tuple.
 data Arity = NoArity | Arity Int
-  --deriving (Eq, Show, Ord, Read)
+  deriving (Eq, Show, Ord, Read)
 
 -- | Datatype to represent the fixity of a constructor. An infix
 -- | declaration directly corresponds to an application of 'Infix'.
 data Fixity = Prefix | Infix Associativity Int
-  --deriving (Eq, Show, Ord, Read)
+  deriving (Eq, Show, Ord, Read)
 
 -- | Get the precedence of a fixity value.
 prec :: Fixity -> Int
@@ -148,7 +148,7 @@ prec (Infix _ n) = n
 data Associativity = LeftAssociative
                    | RightAssociative
                    | NotAssociative
-  --deriving (Eq, Show, Ord, Read)
+  deriving (Eq, Show, Ord, Read)
 
 -- | Representable types of kind *.
 -- This class is derivable in GHC with the DeriveGeneric flag on.
@@ -175,8 +175,8 @@ class Generic1 f where
 -- Derived instances
 ------------------------------------------------------------------------
 deriving instance Generic [a]
---deriving instance Generic (Maybe a)
---deriving instance Generic (Either a b)
+deriving instance Generic (Maybe a)
+deriving instance Generic (Either a b)
 deriving instance Generic Bool
 deriving instance Generic Ordering