Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
H
haddock
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Operate
Environments
Analyze
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
This is an archived project. Repository and other project resources are read-only.
Show more breadcrumbs
Glasgow Haskell Compiler
haddock
Commits
f2bd833f
Commit
f2bd833f
authored
4 years ago
by
Hécate Moonlight
Browse files
Options
Downloads
Patches
Plain Diff
Explicit imports for Haddock.Interface and Haddock.Interface.Create
parent
c7732799
No related branches found
Branches containing commit
No related tags found
Tags containing commit
5 merge requests
!38
Make --no-tmp-comp-dir the default
,
!37
Adapt to latest xhtml version, various optimizations
,
!31
Support HsToken in DataDecl and ClassDecl
,
!12
Drop orphan instance when defined upstream.
,
!10
Haddock interfaces produced from `.hi` files
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
haddock-api/src/Haddock/Interface.hs
+25
-23
25 additions, 23 deletions
haddock-api/src/Haddock/Interface.hs
haddock-api/src/Haddock/Interface/Create.hs
+25
-24
25 additions, 24 deletions
haddock-api/src/Haddock/Interface/Create.hs
with
50 additions
and
47 deletions
haddock-api/src/Haddock/Interface.hs
+
25
−
23
View file @
f2bd833f
...
...
@@ -34,42 +34,44 @@ module Haddock.Interface (
)
where
import
Haddock.GhcUtils
import
Haddock.Interface
File
import
Haddock.Interface.Create
import
Haddock.Interface.
AttachInstan
ce
s
import
Haddock.Interface
.Rename
import
Haddock.GhcUtils
(
moduleString
,
pretty
)
import
Haddock.Interface
.AttachInstances
(
attachInstances
)
import
Haddock.Interface.Create
(
createInterface1
,
runIfM
)
import
Haddock.Interface.
Rename
(
renameInterfa
ce
)
import
Haddock.Interface
File
(
InterfaceFile
,
ifInstalledIfaces
,
ifLinkEnv
)
import
Haddock.Options
hiding
(
verbosity
)
import
Haddock.Types
import
Haddock.Utils
import
Control.Monad
import
Control.Monad.IO.Class
(
MonadIO
)
import
Data.IORef
import
Haddock.Types
(
DocOption
(
..
),
Documentation
(
..
),
ExportItem
(
..
),
IfaceMap
,
InstIfaceMap
,
Interface
,
LinkEnv
,
expItemDecl
,
expItemMbDoc
,
ifaceDoc
,
ifaceExportItems
,
ifaceExports
,
ifaceHaddockCoverage
,
ifaceInstances
,
ifaceMod
,
ifaceOptions
,
ifaceVisibleExports
,
instMod
,
runWriter
,
throwE
)
import
Haddock.Utils
(
Verbosity
(
..
),
normal
,
out
,
verbose
)
import
Control.Monad
(
unless
,
when
)
import
Control.Monad.IO.Class
(
MonadIO
,
liftIO
)
import
Data.IORef
(
atomicModifyIORef'
,
newIORef
,
readIORef
)
import
Data.List
(
foldl'
,
isPrefixOf
,
nub
)
import
Text.Printf
(
printf
)
import
qualified
Data.Map
as
Map
import
qualified
Data.Set
as
Set
import
Text.Printf
import
GHC
hiding
(
verbosity
)
import
GHC.Data.FastString
(
unpackFS
)
import
GHC.Data.Graph.Directed
import
GHC.Driver.Env
import
GHC.Driver.Monad
import
GHC.Data.Graph.Directed
(
flattenSCCs
)
import
GHC.Driver.Env
(
hsc_dflags
,
hsc_home_unit
,
hsc_logger
,
hsc_static_plugins
,
hsc_units
)
import
GHC.Driver.Monad
(
modifySession
,
withTimingM
)
import
GHC.Driver.Session
hiding
(
verbosity
)
import
GHC.HsToCore.Docs
import
GHC.Plugins
(
Outputable
,
Static
Plugin
(
..
),
Plugin
(
..
),
PluginWithArgs
(
..
),
defaultPlugin
,
keepRenamedSource
)
import
GHC.Tc.Types
(
TcM
,
TcGblEnv
(
..
))
import
GHC.Plugins
(
Outputable
,
Plugin
(
..
),
Plugin
WithArgs
(
..
),
StaticPlugin
(
..
),
defaultPlugin
,
keepRenamedSource
)
import
GHC.Tc.Types
(
TcGblEnv
(
..
)
,
TcM
)
import
GHC.Tc.Utils.Env
(
tcLookupGlobal
)
import
GHC.Tc.Utils.Monad
(
getTopEnv
,
setGblEnv
)
import
GHC.Types.Name
(
nameIsFromExternalPackage
,
nameOccName
)
import
GHC.Types.Name.Occurrence
(
isTcOcc
)
import
GHC.Types.Name.Reader
(
unQualOK
,
greMangledName
,
globalRdrEnvElts
)
import
GHC.Unit.Module.Env
(
mk
ModuleSet
,
emptyModuleSet
,
union
ModuleSet
,
ModuleSet
)
import
GHC.Unit.Module.Graph
import
GHC.Unit.Module.ModSummary
import
GHC.Unit.Types
import
GHC.Utils.Error
import
GHC.Types.Name.Reader
(
globalRdrEnvElts
,
greMangledName
,
unQualOK
)
import
GHC.Unit.Module.Env
(
ModuleSet
,
emptyModuleSet
,
mk
ModuleSet
,
union
ModuleSet
)
import
GHC.Unit.Module.Graph
(
ModuleGraphNode
(
..
))
import
GHC.Unit.Module.ModSummary
(
emsModSummary
,
isBootSummary
)
import
GHC.Unit.Types
(
IsBootInterface
(
..
))
import
GHC.Utils.Error
(
withTiming
)
#
if
defined
(
mingw32_HOST_OS
)
import
System.IO
...
...
This diff is collapsed.
Click to expand it.
haddock-api/src/Haddock/Interface/Create.hs
+
25
−
24
View file @
f2bd833f
...
...
@@ -32,48 +32,49 @@
module
Haddock.Interface.Create
(
IfM
,
runIfM
,
createInterface1
)
where
import
Documentation.Haddock.Doc
(
metaDocAppend
)
import
Haddock.Convert
(
PrintRuntimeReps
(
..
),
tyThingToLHsDecl
)
import
Haddock.GhcUtils
(
addClassContext
,
filterSigNames
,
lHsQTyVarsToTypes
,
mkEmptySigType
,
moduleString
,
parents
,
pretty
,
restrictTo
,
sigName
,
unL
)
import
Haddock.Interface.LexParseRn
(
processDocString
,
processDocStringParas
,
processDocStrings
,
processModuleHeader
)
import
Haddock.Options
(
Flag
(
..
),
modulePackageInfo
)
import
Haddock.Types
hiding
(
liftErrMsg
)
import
Haddock.Options
import
Haddock.GhcUtils
import
Haddock.Utils
import
Haddock.Convert
import
Haddock.Interface.LexParseRn
import
Haddock.Utils
(
replace
)
import
Control.Monad.Reader
import
Control.Monad.Reader
(
MonadReader
(
..
),
ReaderT
,
asks
,
runReaderT
)
import
Control.Monad.Writer.Strict
hiding
(
tell
)
import
Data.Bitraversable
import
qualified
Data.Map
as
M
import
Data.Bitraversable
(
bitraverse
)
import
Data.List
(
find
,
foldl'
)
import
Data.Map
(
Map
)
import
Data.List
(
foldl'
,
find
)
import
Data.Maybe
import
Data.Traversable
import
qualified
Data.Map
as
M
import
Data.Maybe
(
catMaybes
,
fromJust
,
isJust
,
mapMaybe
,
maybeToList
)
import
Data.Traversable
(
for
)
import
GHC.Stack
import
GHC
hiding
(
lookupName
)
import
GHC.Core.Class
import
GHC.Core.Class
(
ClassMinimalDef
,
classMinimalDef
)
import
GHC.Core.ConLike
(
ConLike
(
..
))
import
GHC.Data.FastString
(
bytesFS
,
unpackFS
)
import
GHC.Driver.Ppr
import
GHC.Driver.Ppr
(
showSDoc
)
import
GHC.HsToCore.Docs
hiding
(
mkMaps
)
import
GHC.Parser.Annotation
(
IsUnicodeSyntax
(
..
))
import
GHC.Stack
(
HasCallStack
)
import
GHC.Tc.Types
hiding
(
IfM
)
import
GHC.Tc.Utils.Monad
(
finalSafeMode
)
import
GHC.Types.Avail
hiding
(
avail
)
import
qualified
GHC.Types.Avail
as
Avail
import
GHC.Types.Basic
(
PromotionFlag
(
..
))
import
GHC.Types.Name
import
GHC.Types.Name.Env
import
GHC.Types.Name.Reader
import
GHC.Types.Name.Set
import
GHC.Types.SourceFile
import
GHC.Types.SourceText
import
GHC.Types.Name
(
getOccString
,
getSrcSpan
,
isDataConName
,
isValName
,
nameIsLocalOrFrom
,
nameOccName
)
import
GHC.Types.Name.Env
(
lookupNameEnv
)
import
GHC.Types.Name.Reader
(
GlobalRdrEnv
,
greMangledName
,
lookupGlobalRdrEnv
)
import
GHC.Types.Name.Set
(
elemNameSet
,
mkNameSet
)
import
GHC.Types.SourceFile
(
HscSource
(
..
))
import
GHC.Types.SourceText
(
SourceText
(
..
),
sl_fs
)
import
qualified
GHC.Types.SrcLoc
as
SrcLoc
import
qualified
GHC.Unit.Module
as
Module
import
GHC.Unit.Module.ModSummary
import
GHC.Unit.Module.Warnings
import
GHC.Unit.State
import
GHC.Unit.Module.ModSummary
(
msHsFilePath
)
import
GHC.Unit.Module.Warnings
(
WarningTxt
(
..
),
Warnings
(
..
))
import
GHC.Unit.State
(
PackageName
(
..
),
UnitState
,
lookupModuleInAllUnits
)
import
qualified
GHC.Utils.Outputable
as
O
import
GHC.Utils.Panic
import
GHC.Utils.Panic
(
pprPanic
)
newtype
IfEnv
m
=
IfEnv
{
...
...
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