diff options
| author | Alan Zimmerman <alan.zimm@gmail.com> | 2015-11-01 11:13:21 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2015-11-01 13:42:40 +0100 |
| commit | f16827f84855bef94b1b69f49bd1734627946f02 (patch) | |
| tree | 59c729d03232f723d7b2908bb117f5eb04e3e4df /compiler/hsSyn/HsBinds.hs | |
| parent | 84bf1ebae75bff6c1e37382bc348850d17f3f2c0 (diff) | |
| download | haskell-f16827f84855bef94b1b69f49bd1734627946f02.tar.gz | |
ApiAnnotations: BooleanFormula is not properly Located
At the moment BooleanFormula is defined as
data BooleanFormula a = Var a | And [BooleanFormula a]
| Or [BooleanFormula a]
deriving (Eq, Data, Typeable, Functor, Foldable, Traversable)
An API Annotation can only be attached to an item of the form Located a.
Replace this with a properly Located version, and attach the appropriate
API Annotations to it
Updates haddock submodule.
Test Plan: ./validate
Reviewers: austin, bgamari
Reviewed By: bgamari
Subscribers: thomie, mpickering
Differential Revision: https://phabricator.haskell.org/D1384
GHC Trac Issues: #11017
Diffstat (limited to 'compiler/hsSyn/HsBinds.hs')
| -rw-r--r-- | compiler/hsSyn/HsBinds.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/compiler/hsSyn/HsBinds.hs b/compiler/hsSyn/HsBinds.hs index b1b6e62f31..b1d13caf48 100644 --- a/compiler/hsSyn/HsBinds.hs +++ b/compiler/hsSyn/HsBinds.hs @@ -37,7 +37,7 @@ import SrcLoc import Var import Bag import FastString -import BooleanFormula (BooleanFormula) +import BooleanFormula (LBooleanFormula) import Data.Data hiding ( Fixity ) import Data.List @@ -731,7 +731,7 @@ data Sig name -- 'ApiAnnotation.AnnClose' -- For details on above see note [Api annotations] in ApiAnnotation - | MinimalSig SourceText (BooleanFormula (Located name)) + | MinimalSig SourceText (LBooleanFormula (Located name)) -- Note [Pragma source text] in BasicTypes deriving (Typeable) @@ -886,8 +886,8 @@ pprTcSpecPrags (SpecPrags ps) = vcat (map (ppr . unLoc) ps) instance Outputable TcSpecPrag where ppr (SpecPrag var _ inl) = pprSpec var (ptext (sLit "<type>")) inl -pprMinimalSig :: OutputableBndr name => BooleanFormula (Located name) -> SDoc -pprMinimalSig bf = ptext (sLit "MINIMAL") <+> ppr (fmap unLoc bf) +pprMinimalSig :: OutputableBndr name => LBooleanFormula (Located name) -> SDoc +pprMinimalSig (L _ bf) = ptext (sLit "MINIMAL") <+> ppr (fmap unLoc bf) {- ************************************************************************ |