summaryrefslogtreecommitdiff
path: root/libraries/template-haskell/Language/Haskell/TH.hs
diff options
context:
space:
mode:
authorAdam Gundry <adam@well-typed.com>2014-11-18 10:17:22 +0000
committerAdam Gundry <adam@well-typed.com>2014-11-18 10:17:22 +0000
commit7b24febb2afc92289846a1ff7593d9a4ae2b61d1 (patch)
tree218fb067524582677b40ced852d2c2808885c1df /libraries/template-haskell/Language/Haskell/TH.hs
parentc0f657fd2549719b2959dbf93fcd744c02427a5c (diff)
parentb9096df6a9733e38e15361e79973ef5659fc5c22 (diff)
downloadhaskell-wip/tc-plugins-amg.tar.gz
Merge remote-tracking branch 'origin/master' into wip/tc-plugins-amgwip/tc-plugins-amg
Diffstat (limited to 'libraries/template-haskell/Language/Haskell/TH.hs')
-rw-r--r--libraries/template-haskell/Language/Haskell/TH.hs10
1 files changed, 5 insertions, 5 deletions
diff --git a/libraries/template-haskell/Language/Haskell/TH.hs b/libraries/template-haskell/Language/Haskell/TH.hs
index 76aae272bd..e038a3ba6b 100644
--- a/libraries/template-haskell/Language/Haskell/TH.hs
+++ b/libraries/template-haskell/Language/Haskell/TH.hs
@@ -41,15 +41,15 @@ module Language.Haskell.TH(
TExp, unType,
-- * Names
- Name, NameSpace, -- Abstract
+ Name, NameSpace, -- Abstract
-- ** Constructing names
mkName, -- :: String -> Name
newName, -- :: String -> Q Name
-- ** Deconstructing names
- nameBase, -- :: Name -> String
- nameModule, -- :: Name -> Maybe String
+ nameBase, -- :: Name -> String
+ nameModule, -- :: Name -> Maybe String
-- ** Built-in names
- tupleTypeName, tupleDataName, -- Int -> Name
+ tupleTypeName, tupleDataName, -- Int -> Name
unboxedTupleTypeName, unboxedTupleDataName, -- :: Int -> Name
-- * The algebraic data types
@@ -124,7 +124,7 @@ module Language.Haskell.TH(
-- **** Data
valD, funD, tySynD, dataD, newtypeD,
-- **** Class
- classD, instanceD, sigD,
+ classD, instanceD, sigD, standaloneDerivD, defaultSigD,
-- **** Role annotations
roleAnnotD,
-- **** Type Family / Data Family