aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorpanne <unknown>2005-01-16 14:37:10 +0000
committerpanne <unknown>2005-01-16 14:37:10 +0000
commit951d840870e67b452387b35c72d235511ed9163c (patch)
treec62b706cbe5de938a995073cc15e8e463b581fce /src
parentdae3cc3eb74cfe7e59b18242897584664078233f (diff)
[haddock @ 2005-01-16 14:37:10 by panne]
Refactored Text.PrettyPrint legacy hell into a separate module.
Diffstat (limited to 'src')
-rw-r--r--src/HaddockDB.hs8
-rw-r--r--src/HaddockDevHelp.hs14
-rw-r--r--src/HaddockHH.hs15
-rw-r--r--src/HaddockHH2.hs14
-rw-r--r--src/PrettyPrint.hs7
5 files changed, 24 insertions, 34 deletions
diff --git a/src/HaddockDB.hs b/src/HaddockDB.hs
index a9d92250..33e63a8b 100644
--- a/src/HaddockDB.hs
+++ b/src/HaddockDB.hs
@@ -8,14 +8,8 @@ module HaddockDB (ppDocBook) where
import HaddockTypes
import HaddockUtil
-
import HsSyn
-
-#if __GLASGOW_HASKELL__ < 503
-import Pretty
-#else
-import Text.PrettyPrint
-#endif
+import PrettyPrint
-----------------------------------------------------------------------------
-- Printing the results in DocBook format
diff --git a/src/HaddockDevHelp.hs b/src/HaddockDevHelp.hs
index cb8886c2..51cf5da2 100644
--- a/src/HaddockDevHelp.hs
+++ b/src/HaddockDevHelp.hs
@@ -1,19 +1,13 @@
module HaddockDevHelp(ppDevHelpFile) where
+import HaddockModuleTree
+import HaddockTypes
+import HaddockUtil
import HsSyn hiding(Doc)
import qualified Map
-
-#if __GLASGOW_HASKELL__ < 503
-import Pretty
-#else
-import Text.PrettyPrint
-import Data.Char
-#endif
+import PrettyPrint
import Maybe ( fromMaybe )
-import HaddockModuleTree
-import HaddockUtil
-import HaddockTypes
ppDevHelpFile :: FilePath -> String -> Maybe String -> [(Module,Interface)] -> IO ()
diff --git a/src/HaddockHH.hs b/src/HaddockHH.hs
index fb63c872..40d74967 100644
--- a/src/HaddockHH.hs
+++ b/src/HaddockHH.hs
@@ -1,20 +1,17 @@
module HaddockHH(ppHHContents, ppHHIndex, ppHHProject) where
+import HaddockModuleTree
+import HaddockTypes
+import HaddockUtil
import HsSyn hiding(Doc)
+import qualified Map
+import PrettyPrint
-#if __GLASGOW_HASKELL__ < 503
-import Pretty
-#else
-import Text.PrettyPrint
+#if __GLASGOW_HASKELL__ >= 503
import Data.Char ( toUpper )
#endif
import Maybe ( fromMaybe )
-import HaddockModuleTree
-import HaddockUtil
-import HaddockTypes
-import qualified Map
-
ppHHContents :: FilePath -> String -> Maybe String -> [ModuleTree] -> IO ()
ppHHContents odir doctitle maybe_package tree = do
diff --git a/src/HaddockHH2.hs b/src/HaddockHH2.hs
index 3a9abba5..c71d6045 100644
--- a/src/HaddockHH2.hs
+++ b/src/HaddockHH2.hs
@@ -1,19 +1,17 @@
module HaddockHH2(ppHH2Contents, ppHH2Index, ppHH2Files, ppHH2Collection) where
+import HaddockModuleTree
+import HaddockTypes
+import HaddockUtil
import HsSyn hiding(Doc)
+import qualified Map
+import PrettyPrint
-#if __GLASGOW_HASKELL__ < 503
-import Pretty
-#else
-import Text.PrettyPrint
+#if __GLASGOW_HASKELL__ >= 503
import Data.Char ( toUpper )
#endif
import Maybe ( fromMaybe )
-import HaddockModuleTree
-import HaddockUtil
-import HaddockTypes
-import qualified Map
ppHH2Contents :: FilePath -> String -> Maybe String -> [ModuleTree] -> IO ()
ppHH2Contents odir doctitle maybe_package tree = do
diff --git a/src/PrettyPrint.hs b/src/PrettyPrint.hs
new file mode 100644
index 00000000..35d91dc1
--- /dev/null
+++ b/src/PrettyPrint.hs
@@ -0,0 +1,7 @@
+module PrettyPrint ( module Pretty ) where
+
+#if __GLASGOW_HASKELL__ < 503
+import Pretty
+#else
+import Text.PrettyPrint as Pretty
+#endif