summaryrefslogtreecommitdiff
path: root/compiler/parser/ApiAnnotation.hs
diff options
context:
space:
mode:
authorAlan Zimmerman <alan.zimm@gmail.com>2015-05-27 17:50:55 +0200
committerAlan Zimmerman <alan.zimm@gmail.com>2015-05-27 18:54:48 +0200
commit2ac9b8e3220e058e70c2ce0c21604cb390b18fca (patch)
tree56fa308c3899e13b31d3d825fabd183dbc0b2921 /compiler/parser/ApiAnnotation.hs
parent0a7f3b303f29724658ddb1c1481b2a26a5fd8b0a (diff)
downloadhaskell-wip/api-annots-7.10.tar.gz
ApiAnnotations tweakswip/api-annots-7.10
Summary: A collection of minor updates for the API Annotations. 1. The annotations for the implicity parameter is disconnected in the following type MPI = ?mpi_secret :: MPISecret 2. In the following, the annotation for one of the commas is disconeected. mkPoli = mkBila . map ((,,(),,()) <$> P.base <*> P.pos <*> P.form) 3. In the following, the annotation for the parens becomes disconnected data MaybeDefault v where SetTo :: forall v . ( Eq v, Show v ) => !v -> MaybeDefault v SetTo4 :: forall v a. (( Eq v, Show v ) => v -> MaybeDefault v -> a -> MaybeDefault [a]) Test Plan: ./validate Reviewers: hvr, austin Reviewed By: austin Subscribers: bgamari, thomie, mpickering Differential Revision: https://phabricator.haskell.org/D901 GHC Trac Issues: #10399 (cherry picked from commit c5911479f295242e16e396eb5d1369f2e4ce8de0)
Diffstat (limited to 'compiler/parser/ApiAnnotation.hs')
-rw-r--r--compiler/parser/ApiAnnotation.hs3
1 files changed, 3 insertions, 0 deletions
diff --git a/compiler/parser/ApiAnnotation.hs b/compiler/parser/ApiAnnotation.hs
index babd93a0ab..0c80ec7270 100644
--- a/compiler/parser/ApiAnnotation.hs
+++ b/compiler/parser/ApiAnnotation.hs
@@ -233,6 +233,8 @@ data AnnKeywordId
| AnnOpen -- ^ '(\#' or '{-\# LANGUAGE' etc
| AnnOpenC -- ^ '{'
| AnnOpenP -- ^ '('
+ | AnnOpenPE -- ^ '$('
+ | AnnOpenPTE -- ^ '$$('
| AnnOpenS -- ^ '['
| AnnPackageName
| AnnPattern
@@ -248,6 +250,7 @@ data AnnKeywordId
| AnnThen
| AnnThIdSplice -- ^ '$'
| AnnThIdTySplice -- ^ '$$'
+ | AnnThTyQuote -- ^ double '''
| AnnTilde -- ^ '~'
| AnnTildehsh -- ^ '~#'
| AnnType