diff options
| -rw-r--r-- | haddock-ghc.cabal | 30 | ||||
| -rw-r--r-- | src/Haddock/DevHelp.hs (renamed from src/HaddockDevHelp.hs) | 8 | ||||
| -rw-r--r-- | src/Haddock/HH.hs (renamed from src/HaddockHH.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/HH2.hs (renamed from src/HaddockHH2.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/HaddockDB.hs (renamed from src/HaddockDB.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Hoogle.hs (renamed from src/HaddockHoogle.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Html.hs (renamed from src/HaddockHtml.hs) | 20 | ||||
| -rw-r--r-- | src/Haddock/InterfaceFile.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/ModuleTree.hs (renamed from src/HaddockModuleTree.hs) | 4 | ||||
| -rw-r--r-- | src/Haddock/Rename.hs (renamed from src/HaddockRename.hs) | 4 | ||||
| -rw-r--r-- | src/Haddock/Types.hs (renamed from src/HaddockTypes.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Utils.hs (renamed from src/HaddockUtil.hs) | 8 | ||||
| -rw-r--r-- | src/Haddock/Utils/BlockTable.hs (renamed from src/BlockTable.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Utils/FastMutInt2.hs (renamed from src/FastMutInt2.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Utils/GHC.hs (renamed from src/GHCUtils.hs) | 2 | ||||
| -rw-r--r-- | src/Haddock/Utils/Html.hs (renamed from src/Html.hs) | 6 | ||||
| -rw-r--r-- | src/Haddock/Version.hs (renamed from src/HaddockVersion.hs) | 2 | ||||
| -rw-r--r-- | src/Main.hs | 14 | 
18 files changed, 57 insertions, 57 deletions
diff --git a/haddock-ghc.cabal b/haddock-ghc.cabal index 10ee010a..0df410d1 100644 --- a/haddock-ghc.cabal +++ b/haddock-ghc.cabal @@ -62,21 +62,21 @@ main-is: Main.hs  extensions: CPP, PatternGuards  ghc-options: -fglasgow-exts  other-modules: -	FastMutInt2 -	BlockTable -	HaddockDB -	HaddockDevHelp -	HaddockHH -	HaddockHH2 -	HaddockHoogle -	HaddockHtml -	HaddockModuleTree -	HaddockRename -	HaddockTypes -	HaddockUtil -	HaddockVersion -	Html -	GHCUtils +	Haddock.Utils.FastMutInt2 +	Haddock.Utils.BlockTable +	Haddock.HaddockDB +	Haddock.DevHelp +	Haddock.HH +	Haddock.HH2 +	Haddock.Hoogle +	Haddock.Utils.Html +	Haddock.ModuleTree +	Haddock.Rename +	Haddock.Types +	Haddock.Utils +	Haddock.Version +	Haddock.Utils.Html +	Haddock.Utils.GHC  	Haddock.InterfaceFile          	Haddock.Exception  	Main diff --git a/src/HaddockDevHelp.hs b/src/Haddock/DevHelp.hs index 8bf65d1a..afcbd1c3 100644 --- a/src/HaddockDevHelp.hs +++ b/src/Haddock/DevHelp.hs @@ -1,8 +1,8 @@ -module HaddockDevHelp(ppDevHelpFile) where +module Haddock.DevHelp(ppDevHelpFile) where -import HaddockModuleTree -import HaddockTypes -import HaddockUtil +import Haddock.ModuleTree +import Haddock.Types +import Haddock.Utils  import Module        ( moduleName, moduleNameString, Module, mkModule, mkModuleName )  import PackageConfig ( stringToPackageId ) diff --git a/src/HaddockHH.hs b/src/Haddock/HH.hs index 7e6ef394..a41d7297 100644 --- a/src/HaddockHH.hs +++ b/src/Haddock/HH.hs @@ -1,4 +1,4 @@ -module HaddockHH(ppHHContents, ppHHIndex, ppHHProject) where +module Haddock.HH(ppHHContents, ppHHIndex, ppHHProject) where  ppHHContents = error "not yet"  ppHHIndex = error "not yet" diff --git a/src/HaddockHH2.hs b/src/Haddock/HH2.hs index c329e254..945734e6 100644 --- a/src/HaddockHH2.hs +++ b/src/Haddock/HH2.hs @@ -1,4 +1,4 @@ -module HaddockHH2(ppHH2Contents, ppHH2Index, ppHH2Files, ppHH2Collection) where +module Haddock.HH2(ppHH2Contents, ppHH2Index, ppHH2Files, ppHH2Collection) where  ppHH2Contents = error "not yet"  ppHH2Index = error "not yet" diff --git a/src/HaddockDB.hs b/src/Haddock/HaddockDB.hs index bc6af5a6..6341c6c4 100644 --- a/src/HaddockDB.hs +++ b/src/Haddock/HaddockDB.hs @@ -4,7 +4,7 @@  -- (c) Simon Marlow 2003  -- -module HaddockDB (ppDocBook) where +module Haddock.HaddockDB (ppDocBook) where  {-  import HaddockTypes diff --git a/src/HaddockHoogle.hs b/src/Haddock/Hoogle.hs index da43f007..618d6eb3 100644 --- a/src/HaddockHoogle.hs +++ b/src/Haddock/Hoogle.hs @@ -7,7 +7,7 @@  -- Write out Hoogle compatible documentation  -- http://www.haskell.org/hoogle/ -module HaddockHoogle (  +module Haddock.Hoogle (   	ppHoogle    ) where diff --git a/src/HaddockHtml.hs b/src/Haddock/Html.hs index b42cfe6b..6bd80687 100644 --- a/src/HaddockHtml.hs +++ b/src/Haddock/Html.hs @@ -4,7 +4,7 @@  -- (c) Simon Marlow 2003  -- -module HaddockHtml (  +module Haddock.Html (   	ppHtml, copyHtmlBits,   	ppHtmlIndex, ppHtmlContents,  	ppHtmlHelpFiles @@ -12,15 +12,15 @@ module HaddockHtml (  import Prelude hiding (div) -import HaddockDevHelp -import HaddockHH -import HaddockHH2 -import HaddockModuleTree -import HaddockTypes -import HaddockUtil -import HaddockVersion -import Html -import qualified Html +import Haddock.DevHelp +import Haddock.HH +import Haddock.HH2 +import Haddock.ModuleTree +import Haddock.Types +import Haddock.Utils +import Haddock.Version +import Haddock.Utils.Html +import qualified Haddock.Utils.Html as Html  import Control.Exception     ( bracket )  import Control.Monad         ( when, unless ) diff --git a/src/Haddock/InterfaceFile.hs b/src/Haddock/InterfaceFile.hs index becd40df..7964a3a5 100644 --- a/src/Haddock/InterfaceFile.hs +++ b/src/Haddock/InterfaceFile.hs @@ -4,7 +4,7 @@ module Haddock.InterfaceFile (    readInterfaceFile  ) where -import HaddockTypes +import Haddock.Types  import Haddock.Exception  import Binary diff --git a/src/HaddockModuleTree.hs b/src/Haddock/ModuleTree.hs index e32cb960..e4c72880 100644 --- a/src/HaddockModuleTree.hs +++ b/src/Haddock/ModuleTree.hs @@ -1,6 +1,6 @@ -module HaddockModuleTree ( ModuleTree(..), mkModuleTree ) where +module Haddock.ModuleTree ( ModuleTree(..), mkModuleTree ) where -import HaddockTypes  ( DocName ) +import Haddock.Types ( DocName )  import GHC           ( HsDoc, Name )  import Module        ( Module, moduleNameString, moduleName, modulePackageId )  import PackageConfig ( packageIdString ) diff --git a/src/HaddockRename.hs b/src/Haddock/Rename.hs index f5c5f99c..7e12a412 100644 --- a/src/HaddockRename.hs +++ b/src/Haddock/Rename.hs @@ -4,12 +4,12 @@  -- (c) Simon Marlow 2003  -- -module HaddockRename ( +module Haddock.Rename (    runRnFM, -- the monad (instance of Monad)    renameDoc, renameMaybeDoc, renameExportItems,  ) where -import HaddockTypes +import Haddock.Types  import GHC  import BasicTypes diff --git a/src/HaddockTypes.hs b/src/Haddock/Types.hs index bdc2d9cd..4c4587ac 100644 --- a/src/HaddockTypes.hs +++ b/src/Haddock/Types.hs @@ -6,7 +6,7 @@  -- Ported to use the GHC API by David Waern 2006  --  -module HaddockTypes where +module Haddock.Types where  import GHC  import Outputable diff --git a/src/HaddockUtil.hs b/src/Haddock/Utils.hs index 1d962c82..27f60e4a 100644 --- a/src/HaddockUtil.hs +++ b/src/Haddock/Utils.hs @@ -5,7 +5,7 @@  -- (c) Simon Marlow 2003  -- -module HaddockUtil ( +module Haddock.Utils (    -- * Misc utilities    restrictTo,  @@ -33,9 +33,7 @@ module HaddockUtil (  --  FormatVersion, mkFormatVersion     ) where -import HaddockTypes -import Data.Map ( Map ) -import qualified Data.Map as Map hiding ( Map ) +import Haddock.Types  import GHC  import SrcLoc @@ -46,6 +44,8 @@ import Module  import PackageConfig ( stringToPackageId )  import Control.Monad ( liftM, MonadPlus(..) ) +import Data.Map ( Map ) +import qualified Data.Map as Map hiding ( Map )  import Data.Char  import Data.IORef ( IORef, newIORef, readIORef )  import Data.List ( intersect, isSuffixOf, intersperse ) diff --git a/src/BlockTable.hs b/src/Haddock/Utils/BlockTable.hs index 5cd46f1b..ed51654e 100644 --- a/src/BlockTable.hs +++ b/src/Haddock/Utils/BlockTable.hs @@ -15,7 +15,7 @@  --  ----------------------------------------------------------------------------- -module BlockTable ( +module Haddock.Utils.BlockTable (  -- Datatypes: diff --git a/src/FastMutInt2.hs b/src/Haddock/Utils/FastMutInt2.hs index a197a448..c47b514b 100644 --- a/src/FastMutInt2.hs +++ b/src/Haddock/Utils/FastMutInt2.hs @@ -4,7 +4,7 @@  --  -- Unboxed mutable Ints -module FastMutInt2( +module Haddock.Utils.FastMutInt2(  	FastMutInt, newFastMutInt,  	readFastMutInt, writeFastMutInt,  	incFastMutInt, incFastMutIntBy diff --git a/src/GHCUtils.hs b/src/Haddock/Utils/GHC.hs index 2c732923..b6fb54d4 100644 --- a/src/GHCUtils.hs +++ b/src/Haddock/Utils/GHC.hs @@ -1,4 +1,4 @@ -module GHCUtils where +module Haddock.Utils.GHC where  import Debug.Trace diff --git a/src/Html.hs b/src/Haddock/Utils/Html.hs index 530df829..dbef2112 100644 --- a/src/Html.hs +++ b/src/Haddock/Utils/Html.hs @@ -13,11 +13,11 @@  --  ----------------------------------------------------------------------------- -module Html ( -      module Html, +module Haddock.Utils.Html ( +      module Haddock.Utils.Html,        ) where -import qualified BlockTable as BT +import qualified Haddock.Utils.BlockTable as BT  import Data.Char (isAscii, ord)  import Numeric (showHex) diff --git a/src/HaddockVersion.hs b/src/Haddock/Version.hs index ad2bfa3f..f4d02b7d 100644 --- a/src/HaddockVersion.hs +++ b/src/Haddock/Version.hs @@ -4,7 +4,7 @@  -- (c) Simon Marlow 2003  -- -module HaddockVersion (  +module Haddock.Version (   	projectName, projectVersion, projectUrl     ) where diff --git a/src/Main.hs b/src/Main.hs index 11b2a646..2f7e4bf0 100644 --- a/src/Main.hs +++ b/src/Main.hs @@ -8,15 +8,15 @@  module Main (main) where -import HaddockHtml -import HaddockHoogle -import HaddockRename -import HaddockTypes -import HaddockUtil -import HaddockVersion +import Haddock.Html +import Haddock.Hoogle +import Haddock.Rename +import Haddock.Types +import Haddock.Utils +import Haddock.Version  import Haddock.InterfaceFile  import Haddock.Exception -import GHCUtils +import Haddock.Utils.GHC  import Paths_haddock_ghc     ( getDataDir )  import Prelude hiding ( catch )  | 
