Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
haddock
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Rinat Striungis
haddock
Commits
853397a9
Commit
853397a9
authored
13 years ago
by
dterei
Browse files
Options
Downloads
Patches
Plain Diff
Fix reporting of modules safe haskell mode (#5989)
parent
0a9b99a0
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/Haddock/Interface/Create.hs
+2
-1
2 additions, 1 deletion
src/Haddock/Interface/Create.hs
src/Haddock/Interface/LexParseRn.hs
+4
-4
4 additions, 4 deletions
src/Haddock/Interface/LexParseRn.hs
with
6 additions
and
5 deletions
src/Haddock/Interface/Create.hs
+
2
−
1
View file @
853397a9
...
...
@@ -45,6 +45,7 @@ createInterface tm flags modMap instIfaceMap = do
let
ms
=
pm_mod_summary
.
tm_parsed_module
$
tm
mi
=
moduleInfo
tm
safety
=
modInfoSafe
mi
mdl
=
ms_mod
ms
dflags
=
ms_hspp_opts
ms
instances
=
modInfoInstances
mi
...
...
@@ -68,7 +69,7 @@ createInterface tm flags modMap instIfaceMap = do
|
Flag_IgnoreAllExports
`
elem
`
flags
=
OptIgnoreExports
:
opts0
|
otherwise
=
opts0
(
info
,
mbDoc
)
<-
liftErrMsg
$
lexParseRnHaddockModHeader
dflags
gre
mayDocHeader
(
info
,
mbDoc
)
<-
liftErrMsg
$
lexParseRnHaddockModHeader
dflags
gre
safety
mayDocHeader
let
declsWithDocs
=
topDecls
group_
(
decls
,
_
)
=
unzip
declsWithDocs
...
...
This diff is collapsed.
Click to expand it.
src/Haddock/Interface/LexParseRn.hs
+
4
−
4
View file @
853397a9
...
...
@@ -67,8 +67,9 @@ lexParseRnMbHaddockComment dflags hty gre (Just d) = lexParseRnHaddockComment df
-- yes, you always get a HaddockModInfo though it might be empty
lexParseRnHaddockModHeader
::
DynFlags
->
GlobalRdrEnv
->
GhcDocHdr
->
ErrMsgM
(
HaddockModInfo
Name
,
Maybe
(
Doc
Name
))
lexParseRnHaddockModHeader
dflags
gre
mbStr
=
do
lexParseRnHaddockModHeader
::
DynFlags
->
GlobalRdrEnv
->
SafeHaskellMode
->
GhcDocHdr
->
ErrMsgM
(
HaddockModInfo
Name
,
Maybe
(
Doc
Name
))
lexParseRnHaddockModHeader
dflags
gre
safety
mbStr
=
do
(
hmi
,
docn
)
<-
case
mbStr
of
Nothing
->
return
failure
...
...
@@ -79,9 +80,8 @@ lexParseRnHaddockModHeader dflags gre mbStr = do
tell
[
"haddock module header parse failed: "
++
mess
]
return
failure
Right
(
info
,
doc
)
->
return
(
renameHmi
gre
info
,
Just
(
rename
gre
doc
))
return
(
hmi
{
hmi_safety
=
safety
},
docn
)
return
(
hmi
{
hmi_safety
=
Just
$
showPpr
safety
},
docn
)
where
safety
=
Just
$
showPpr
$
safeHaskell
dflags
failure
=
(
emptyHaddockModInfo
,
Nothing
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment