From 07c816c5e548824bb089442cf32d70682e47200b Mon Sep 17 00:00:00 2001
From: David Waern <david.waern@gmail.com>
Date: Sat, 26 Nov 2011 22:10:28 +0100
Subject: Fix module reference bug.

---
 src/Haddock/Backends/Xhtml/DocMarkup.hs | 3 +--
 src/Haddock/Backends/Xhtml/Names.hs     | 6 +++---
 src/Haddock/GhcUtils.hs                 | 4 ----
 3 files changed, 4 insertions(+), 9 deletions(-)

(limited to 'src/Haddock')

diff --git a/src/Haddock/Backends/Xhtml/DocMarkup.hs b/src/Haddock/Backends/Xhtml/DocMarkup.hs
index 87d67b76..f506d2b8 100644
--- a/src/Haddock/Backends/Xhtml/DocMarkup.hs
+++ b/src/Haddock/Backends/Xhtml/DocMarkup.hs
@@ -21,7 +21,6 @@ module Haddock.Backends.Xhtml.DocMarkup (
 
 import Haddock.Backends.Xhtml.Names
 import Haddock.Backends.Xhtml.Utils
-import Haddock.GhcUtils
 import Haddock.Types
 import Haddock.Utils
 
@@ -39,7 +38,7 @@ parHtmlMarkup qual ppId = Markup {
   markupIdentifier           = thecode . ppId,
   markupIdentifierUnchecked  = thecode . ppUncheckedLink qual,
   markupModule               = \m -> let (mdl,ref) = break (=='#') m
-                                     in ppModuleRef (mkModuleNoPackage mdl) ref,
+                                     in ppModuleRef (mkModuleName mdl) ref,
   markupEmphasis             = emphasize,
   markupMonospaced           = thecode,
   markupUnorderedList        = unordList,
diff --git a/src/Haddock/Backends/Xhtml/Names.hs b/src/Haddock/Backends/Xhtml/Names.hs
index 19efea2e..7c2375cf 100644
--- a/src/Haddock/Backends/Xhtml/Names.hs
+++ b/src/Haddock/Backends/Xhtml/Names.hs
@@ -127,9 +127,9 @@ ppModule mdl = anchor ! [href (moduleUrl mdl)]
                << toHtml (moduleString mdl)
 
 
-ppModuleRef :: Module -> String -> Html
-ppModuleRef mdl ref = anchor ! [href (moduleUrl mdl ++ ref)]
-                      << toHtml (moduleString mdl)
+ppModuleRef :: ModuleName -> String -> Html
+ppModuleRef mdl ref = anchor ! [href (moduleHtmlFile' mdl ++ ref)]
+                      << toHtml (moduleNameString mdl)
     -- NB: The ref parameter already includes the '#'.
     -- This function is only called from markupModule expanding a
     -- DocModule, which doesn't seem to be ever be used.
diff --git a/src/Haddock/GhcUtils.hs b/src/Haddock/GhcUtils.hs
index 6d170586..2fb8c8a3 100644
--- a/src/Haddock/GhcUtils.hs
+++ b/src/Haddock/GhcUtils.hs
@@ -61,10 +61,6 @@ unpackPackageId p
   where str = packageIdString p
 
 
-mkModuleNoPackage :: String -> Module
-mkModuleNoPackage str = mkModule (stringToPackageId "") (mkModuleName str)
-
-
 lookupLoadedHomeModuleGRE  :: GhcMonad m => ModuleName -> m (Maybe GlobalRdrEnv)
 lookupLoadedHomeModuleGRE mod_name = withSession $ \hsc_env ->
   case lookupUFM (hsc_HPT hsc_env) mod_name of
-- 
cgit v1.2.3