summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorOleg Grenrus <oleg.grenrus@iki.fi>2017-01-19 15:19:25 -0500
committerBen Gamari <ben@smart-cactus.org>2017-01-20 13:42:56 -0500
commit7026edc37331d067c47e4a3506590a39c22f82d3 (patch)
tree7883b7bb5706eaf30df568eda3692c52f5a98aa1 /libraries
parent5ff812c14594f507c48121f16be4752eee6e3c88 (diff)
downloadhaskell-7026edc37331d067c47e4a3506590a39c22f82d3.tar.gz
Add 'type family (m :: Symbol) <> (n :: Symbol)'
Reviewers: dfeuer, austin, bgamari, hvr Subscribers: dfeuer, mpickering, RyanGlScott, ekmett, yav, lelf, simonpj, thomie Differential Revision: https://phabricator.haskell.org/D2632 GHC Trac Issues: #12162
Diffstat (limited to 'libraries')
-rw-r--r--libraries/base/GHC/TypeLits.hs5
-rw-r--r--libraries/base/changelog.md3
2 files changed, 8 insertions, 0 deletions
diff --git a/libraries/base/GHC/TypeLits.hs b/libraries/base/GHC/TypeLits.hs
index 6d66c1109f..41cf523ab8 100644
--- a/libraries/base/GHC/TypeLits.hs
+++ b/libraries/base/GHC/TypeLits.hs
@@ -35,6 +35,7 @@ module GHC.TypeLits
-- * Functions on type literals
, type (<=), type (<=?), type (+), type (*), type (^), type (-)
+ , AppendSymbol
, CmpNat, CmpSymbol
-- * User-defined type errors
@@ -203,6 +204,10 @@ type family (m :: Nat) ^ (n :: Nat) :: Nat
-- @since 4.7.0.0
type family (m :: Nat) - (n :: Nat) :: Nat
+-- | Concatenation of type-level symbols.
+--
+-- @since 4.10.0.0
+type family AppendSymbol (m ::Symbol) (n :: Symbol) :: Symbol
-- | A description of a custom type error.
data {-kind-} ErrorMessage = Text Symbol
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index f1a93eeca2..608830a9d6 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -40,6 +40,9 @@
* Add `plusForeignPtr` to `Foreign.ForeignPtr`.
+ * Add `type family AppendSymbol (m :: Symbol) (n :: Symbol) :: Symbol` to `GHC.TypeLits`
+ (#12162)
+
## 4.9.0.0 *May 2016*
* Bundled with GHC 8.0