projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove maybePrefixMatch, using stripPrefix instead
[ghc-hetmet.git]
/
compiler
/
parser
/
HaddockUtils.hs
diff --git
a/compiler/parser/HaddockUtils.hs
b/compiler/parser/HaddockUtils.hs
index
70a5da2
..
b84692a
100644
(file)
--- a/
compiler/parser/HaddockUtils.hs
+++ b/
compiler/parser/HaddockUtils.hs
@@
-2,16
+2,13
@@
module HaddockUtils where
import HsSyn
module HaddockUtils where
import HsSyn
-import HsDoc
import {-# SOURCE #-} HaddockLex
import HaddockParse
import SrcLoc
import RdrName
import Control.Monad
import {-# SOURCE #-} HaddockLex
import HaddockParse
import SrcLoc
import RdrName
import Control.Monad
-import Data.Maybe
import Data.Char
import Data.Char
-import Data.Either
-- -----------------------------------------------------------------------------
-- Parsing module headers
-- -----------------------------------------------------------------------------
-- Parsing module headers
@@
-151,17
+148,16
@@
parseKey key toParse0 =
-- -----------------------------------------------------------------------------
-- Adding documentation to record fields (used in parsing).
-- -----------------------------------------------------------------------------
-- Adding documentation to record fields (used in parsing).
-type Field a = ([Located a], LBangType a, Maybe (LHsDoc a))
+addFieldDoc :: ConDeclField a -> Maybe (LHsDoc a) -> ConDeclField a
+addFieldDoc fld doc = fld { cd_fld_doc = cd_fld_doc fld `mplus` doc }
-addFieldDoc :: Field a -> Maybe (LHsDoc a) -> Field a
-addFieldDoc (a, b, c) doc = (a, b, c `mplus` doc)
-
-addFieldDocs :: [Field a] -> Maybe (LHsDoc a) -> [Field a]
+addFieldDocs :: [ConDeclField a] -> Maybe (LHsDoc a) -> [ConDeclField a]
addFieldDocs [] _ = []
addFieldDocs (x:xs) doc = addFieldDoc x doc : xs
addConDoc :: LConDecl a -> Maybe (LHsDoc a) -> LConDecl a
addFieldDocs [] _ = []
addFieldDocs (x:xs) doc = addFieldDoc x doc : xs
addConDoc :: LConDecl a -> Maybe (LHsDoc a) -> LConDecl a
-addConDoc (L p c) doc = L p ( c { con_doc = con_doc c `mplus` doc } )
+addConDoc decl Nothing = decl
+addConDoc (L p c) doc = L p ( c { con_doc = con_doc c `mplus` doc } )
addConDocs :: [LConDecl a] -> Maybe (LHsDoc a) -> [LConDecl a]
addConDocs [] _ = []
addConDocs :: [LConDecl a] -> Maybe (LHsDoc a) -> [LConDecl a]
addConDocs [] _ = []