diff options
| author | David Waern <david.waern@gmail.com> | 2008-06-19 18:40:13 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2008-06-19 18:40:13 +0000 |
| commit | 488a237dd9f29efea9fbf1187c74a7eea1cdc1fc (patch) | |
| tree | 3272a22f8cb66e58be1638b674a456ec11649b19 | |
| parent | 9e70736bf57ff648feb892ee65500b29a0ad4381 (diff) | |
Be more consistent with GHC API naming in H.GHC.Utils
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/GHC/Utils.hs | 12 | ||||
| -rw-r--r-- | src/Main.hs | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index b1f7511b..d30c322f 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -1349,7 +1349,7 @@ parHtmlMarkup ppId = Markup { markupString = toHtml, markupAppend = (+++), markupIdentifier = tt . ppId . head, - markupModule = \m -> ppModule (mkModuleNoPkg m) "", + markupModule = \m -> ppModule (mkModuleNoPackage m) "", markupEmphasis = emphasize . toHtml, markupMonospaced = tt . toHtml, markupUnorderedList = ulist . concatHtml . map (li <<), diff --git a/src/Haddock/GHC/Utils.hs b/src/Haddock/GHC/Utils.hs index 97a682d4..e71cc2e1 100644 --- a/src/Haddock/GHC/Utils.hs +++ b/src/Haddock/GHC/Utils.hs @@ -29,18 +29,18 @@ moduleString = moduleNameString . moduleName -- return the name of the package, with version info -modulePkgStr = packageIdString . modulePackageId +modulePackageString = packageIdString . modulePackageId -- return the (name,version) of the package -modulePkgInfo mod = case unpackPackageId pkg of - Nothing -> (packageIdString pkg, "") - Just x -> (pkgName x, showVersion (pkgVersion x)) +modulePackageInfo mod = case unpackPackageId pkg of + Nothing -> (packageIdString pkg, "") + Just x -> (pkgName x, showVersion (pkgVersion x)) where pkg = modulePackageId mod -mkModuleNoPkg :: String -> Module -mkModuleNoPkg str = mkModule (stringToPackageId "") (mkModuleName str) +mkModuleNoPackage :: String -> Module +mkModuleNoPackage str = mkModule (stringToPackageId "") (mkModuleName str) instance (Outputable a, Outputable b) => Outputable (Map.Map a b) where diff --git a/src/Main.hs b/src/Main.hs index 958eda13..f19ae659 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -204,8 +204,8 @@ render flags interfaces installedIfaces = do ++ installedIfaces packageMod = ifaceMod (head visibleIfaces) - packageStr = Just (modulePkgStr packageMod) - (pkgName,pkgVer) = modulePkgInfo packageMod + packageStr = Just (modulePackageString packageMod) + (pkgName,pkgVer) = modulePackageInfo packageMod when (Flag_GenIndex `elem` flags) $ do |