summaryrefslogtreecommitdiff
path: root/libraries/base
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2015-04-03 00:48:51 -0500
committerAustin Seipp <austin@well-typed.com>2015-04-03 00:48:56 -0500
commit3541f736486d08df36863fd8e29deb1ca637a498 (patch)
treea8800dacca6f3a3012f4edf1fcdb8ac9580bbd4e /libraries/base
parent012ea0b96cc041bced4565d74bef7ccb75f1af0d (diff)
downloadhaskell-3541f736486d08df36863fd8e29deb1ca637a498.tar.gz
Data.Complex: Derive Generic
Reviewed By: hvr, austin Differential Revision: https://phabricator.haskell.org/D770
Diffstat (limited to 'libraries/base')
-rw-r--r--libraries/base/Data/Complex.hs4
-rw-r--r--libraries/base/changelog.md1
2 files changed, 4 insertions, 1 deletions
diff --git a/libraries/base/Data/Complex.hs b/libraries/base/Data/Complex.hs
index 88aa597db4..c6420cdcb2 100644
--- a/libraries/base/Data/Complex.hs
+++ b/libraries/base/Data/Complex.hs
@@ -1,6 +1,7 @@
{-# LANGUAGE DeriveDataTypeable #-}
{-# LANGUAGE Trustworthy #-}
{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE DeriveGeneric #-}
-----------------------------------------------------------------------------
-- |
@@ -34,6 +35,7 @@ module Data.Complex
) where
+import GHC.Generics (Generic)
import Data.Data (Data)
import Foreign (Storable, castPtr, peek, poke, pokeElemOff, peekElemOff, sizeOf,
alignment)
@@ -51,7 +53,7 @@ infix 6 :+
data Complex a
= !a :+ !a -- ^ forms a complex number from its real and imaginary
-- rectangular components.
- deriving (Eq, Show, Read, Data)
+ deriving (Eq, Show, Read, Data, Generic)
-- -----------------------------------------------------------------------------
-- Functions over Complex
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index f4021892c0..ea509af2e2 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -29,6 +29,7 @@
* New `GHC.Stack.CallStack` data type
+ * `Complex` now has a `Generic` instance
## 4.8.0.0 *Mar 2015*