diff options
| author | David Waern <david.waern@gmail.com> | 2010-08-29 13:11:03 +0000 |
|---|---|---|
| committer | David Waern <david.waern@gmail.com> | 2010-08-29 13:11:03 +0000 |
| commit | 1de86e8aaa5719c248b03f1d3a166849fedc3919 (patch) | |
| tree | 869a90c4e9be2da86d70a474b28078f8246a025d /src/Haddock | |
| parent | d5ec98534422eba93298bb8a76e6b315a55c3158 (diff) | |
Naming wibbles
Diffstat (limited to 'src/Haddock')
| -rw-r--r-- | src/Haddock/Options.hs | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/src/Haddock/Options.hs b/src/Haddock/Options.hs index 65c3092e..4df61fe3 100644 --- a/src/Haddock/Options.hs +++ b/src/Haddock/Options.hs @@ -20,13 +20,13 @@ module Haddock.Options ( optContentsUrl, optIndexUrl, optCssFile, - optSourceUrls, - optWikiUrls, + sourceUrls, + wikiUrls, optDumpInterfaceFile, optLaTeXStyle, verbosity, ghcFlags, - ifaceTriples + readIfaceArgs ) where @@ -196,15 +196,15 @@ optCssFile :: [Flag] -> Maybe FilePath optCssFile flags = optLast [ str | Flag_CSS str <- flags ] -optSourceUrls :: [Flag] -> (Maybe String, Maybe String, Maybe String) -optSourceUrls flags = +sourceUrls :: [Flag] -> (Maybe String, Maybe String, Maybe String) +sourceUrls flags = (listToMaybe [str | Flag_SourceBaseURL str <- flags] ,listToMaybe [str | Flag_SourceModuleURL str <- flags] ,listToMaybe [str | Flag_SourceEntityURL str <- flags]) -optWikiUrls :: [Flag] -> (Maybe String, Maybe String, Maybe String) -optWikiUrls flags = +wikiUrls :: [Flag] -> (Maybe String, Maybe String, Maybe String) +wikiUrls flags = (listToMaybe [str | Flag_WikiBaseURL str <- flags] ,listToMaybe [str | Flag_WikiModuleURL str <- flags] ,listToMaybe [str | Flag_WikiEntityURL str <- flags]) @@ -217,6 +217,7 @@ optDumpInterfaceFile flags = optLast [ str | Flag_DumpInterface str <- flags ] optLaTeXStyle :: [Flag] -> Maybe String optLaTeXStyle flags = optLast [ str | Flag_LaTeXStyle str <- flags ] + verbosity :: [Flag] -> Verbosity verbosity flags = case [ str | Flag_Verbosity str <- flags ] of @@ -230,8 +231,8 @@ ghcFlags :: [Flag] -> [String] ghcFlags flags = [ option | Flag_OptGhc option <- flags ] -ifaceTriples :: [Flag] -> [(DocPaths, FilePath)] -ifaceTriples flags = [ parseIfaceOption s | Flag_ReadInterface s <- flags ] +readIfaceArgs :: [Flag] -> [(DocPaths, FilePath)] +readIfaceArgs flags = [ parseIfaceOption s | Flag_ReadInterface s <- flags ] where parseIfaceOption :: String -> (DocPaths, FilePath) parseIfaceOption str = |