diff options
| author | Jan Stolarek <jan.stolarek@p.lodz.pl> | 2014-07-11 13:54:45 +0200 |
|---|---|---|
| committer | Jan Stolarek <jan.stolarek@p.lodz.pl> | 2015-09-03 05:55:15 +0200 |
| commit | 374457809de343f409fbeea0a885877947a133a2 (patch) | |
| tree | a354d0f4ddb6c32e6c85b853071d2107f6b8398c /libraries/template-haskell/Language/Haskell/TH/PprLib.hs | |
| parent | bd16e0bc6af13f1347235782935f7dcd40b260e2 (diff) | |
| download | haskell-374457809de343f409fbeea0a885877947a133a2.tar.gz | |
Injective type families
For details see #6018, Phab:D202 and the wiki page:
https://ghc.haskell.org/trac/ghc/wiki/InjectiveTypeFamilies
This patch also wires-in Maybe data type and updates haddock submodule.
Test Plan: ./validate
Reviewers: simonpj, goldfire, austin, bgamari
Subscribers: mpickering, bgamari, alanz, thomie, goldfire, simonmar,
carter
Differential Revision: https://phabricator.haskell.org/D202
GHC Trac Issues: #6018
Diffstat (limited to 'libraries/template-haskell/Language/Haskell/TH/PprLib.hs')
| -rw-r--r-- | libraries/template-haskell/Language/Haskell/TH/PprLib.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libraries/template-haskell/Language/Haskell/TH/PprLib.hs b/libraries/template-haskell/Language/Haskell/TH/PprLib.hs index 68134965a5..8019e48205 100644 --- a/libraries/template-haskell/Language/Haskell/TH/PprLib.hs +++ b/libraries/template-haskell/Language/Haskell/TH/PprLib.hs @@ -10,7 +10,7 @@ module Language.Haskell.TH.PprLib ( -- * Primitive Documents empty, - semi, comma, colon, space, equals, arrow, + semi, comma, colon, dcolon, space, equals, arrow, lparen, rparen, lbrack, rbrack, lbrace, rbrace, -- * Converting values into documents @@ -27,7 +27,7 @@ module Language.Haskell.TH.PprLib ( fsep, fcat, nest, hang, punctuate, - + -- * Predicates on documents isEmpty, @@ -63,6 +63,7 @@ empty :: Doc; -- ^ An empty document semi :: Doc; -- ^ A ';' character comma :: Doc; -- ^ A ',' character colon :: Doc; -- ^ A ':' character +dcolon :: Doc; -- ^ A "::" string space :: Doc; -- ^ A space character equals :: Doc; -- ^ A '=' character arrow :: Doc; -- ^ A "->" string @@ -171,6 +172,7 @@ empty = return HPJ.empty semi = return HPJ.semi comma = return HPJ.comma colon = return HPJ.colon +dcolon = return $ HPJ.text "::" space = return HPJ.space equals = return HPJ.equals arrow = return $ HPJ.text "->" |