diff options
| author | Niklas Haas <git@nand.wakku.to> | 2014-03-09 06:07:09 +0100 |
|---|---|---|
| committer | Niklas Haas <git@nand.wakku.to> | 2014-03-09 07:53:46 +0100 |
| commit | 003f11795e4413abae5275e8a855765c571ccab9 (patch) | |
| tree | ffb3d98d8883a236347e069545adf2f2d3bf3405 /src/Haddock.hs | |
| parent | 9aa5a2a420788e39806c5fe85845002181f3b945 (diff) | |
Differentiate between TH splices (line-links) and regular names
This adds a new type of source code link, to a specific line rather than
a specific declaration/name - this is used to link to the location of a
TH splice that defines a certain name.
Rather hefty changes throughout and still one unresolved issue (the line
URLs aren't parsed from the third form of --read-interface which means
they're currently restricted to same-interface links). Not sure if
this issue is really worth all the hassle, especially since we could
just use line links in general.
This commit also contains some cleanup/clarification of the types in
Haddock.Backends.Xhtml.Decl and shortens some overlong lines in the
process. Notably, the Bool parameter was replaced by a Unicode type
synonym to help clarify its presence in type signatures.
Diffstat (limited to 'src/Haddock.hs')
| -rw-r--r-- | src/Haddock.hs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Haddock.hs b/src/Haddock.hs index cc7e7842..e4c7fdc0 100644 --- a/src/Haddock.hs +++ b/src/Haddock.hs @@ -242,9 +242,11 @@ render dflags flags qual ifaces installedIfaces srcMap = do pkgStr = Just (packageIdString pkgId) (pkgName,pkgVer) = modulePackageInfo pkgMod - (srcBase, srcModule, srcEntity) = sourceUrls flags + (srcBase, srcModule, srcEntity, srcLEntity) = sourceUrls flags srcMap' = maybe srcMap (\path -> Map.insert pkgId path srcMap) srcEntity - sourceUrls' = (srcBase, srcModule, srcMap') + -- TODO: Get these from the interface files as with srcMap + srcLMap' = maybe Map.empty (\path -> Map.singleton pkgId path) srcLEntity + sourceUrls' = (srcBase, srcModule, srcMap', srcLMap') libDir <- getHaddockLibDir flags prologue <- getPrologue dflags flags |