aboutsummaryrefslogtreecommitdiff
path: root/src/Main.hs
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2009-01-02 21:38:27 +0000
committerDavid Waern <david.waern@gmail.com>2009-01-02 21:38:27 +0000
commitca90e10eab9c938f211ce5e83ae0e8c15222a958 (patch)
treeb9064bab6933addfe2df86e0f72277f63c5a86dd /src/Main.hs
parent422366027d23ed1d57902adaa9360e386fb6ae7c (diff)
Show re-exported names from external packages again
This fixes GHC ticket 2746. In order to also link to the exported subordinate names of a declaration, we need to re-introduce the sub map in the .haddock files.
Diffstat (limited to 'src/Main.hs')
-rw-r--r--src/Main.hs11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/Main.hs b/src/Main.hs
index 686e9237..328fce4d 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -166,11 +166,10 @@ main = handleTopExceptions $ do
-- get packages supplied with --read-interface
packages <- readInterfaceFiles nameCacheFromGhc (ifacePairs flags)
- -- combine the link envs of the external packages into one
- let extLinks = Map.unions (map (ifLinkEnv . fst) packages)
-- create the interfaces -- this is the core part of Haddock
- (interfaces, homeLinks) <- createInterfaces fileArgs extLinks flags
+ (interfaces, homeLinks) <- createInterfaces fileArgs flags
+ (map fst packages)
liftIO $ do
-- render the interfaces
@@ -185,11 +184,9 @@ main = handleTopExceptions $ do
-- get packages supplied with --read-interface
packages <- readInterfaceFiles (nameCacheFromGhc session) (ifacePairs flags)
- -- combine the link envs of the external packages into one
- let extLinks = Map.unions (map (ifLinkEnv . fst) packages)
-
-- create the interfaces -- this is the core part of Haddock
- (interfaces, homeLinks) <- createInterfaces session fileArgs extLinks flags
+ (interfaces, homeLinks) <- createInterfaces session fileArgs flags
+ (map fst packages)
-- render the interfaces
renderStep packages interfaces