From 7e00d4646b0ab3694cee32752d2a8bac04317446 Mon Sep 17 00:00:00 2001 From: davve Date: Sun, 30 Jul 2006 21:01:57 +0000 Subject: Start porting the Html renderer --- src/HaddockRename.hs | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) (limited to 'src/HaddockRename.hs') diff --git a/src/HaddockRename.hs b/src/HaddockRename.hs index 45db4433..1953a23c 100644 --- a/src/HaddockRename.hs +++ b/src/HaddockRename.hs @@ -5,29 +5,21 @@ -- module HaddockRename ( - RnM, runRn, runRnFM, -- the monad (instance of Monad) - - --renameExportList, - --renameDecl, - --renameExportItems, renameInstHead, - --renameDoc, renameMaybeDoc, + runRnFM, -- the monad (instance of Monad) renameMaybeDoc, renameExportItems, - ) where +) where import HaddockTypes -import HaddockUtil ( unQual ) ---import HsSyn2 -import Map ( Map ) -import qualified Map hiding ( Map ) - -import Prelude hiding ( mapM ) -import Control.Monad hiding ( mapM ) -import Data.Traversable import GHC import BasicTypes import SrcLoc -import Bag +import Bag ( emptyBag ) + +import Data.Map ( Map ) +import qualified Data.Map as Map hiding ( Map ) +import Prelude hiding ( mapM ) +import Data.Traversable ( mapM ) -- ----------------------------------------------------------------------------- -- Monad for renaming @@ -214,18 +206,15 @@ renameInstHead (preds, className, types) = do renameLDecl (L loc d) = return . L loc =<< renameDecl d renameDecl d = case d of - TyClD d doc -> do + TyClD d -> do d' <- renameTyClD d - doc' <- renameMaybeDoc doc - return (TyClD d' doc') - SigD s doc -> do + return (TyClD d') + SigD s -> do s' <- renameSig s - doc' <- renameMaybeDoc doc - return (SigD s' doc') - ForD d doc -> do + return (SigD s') + ForD d -> do d' <- renameForD d - doc' <- renameMaybeDoc doc - return (ForD d' doc') + return (ForD d') _ -> error "renameDecl" renameTyClD d = case d of -- cgit v1.2.3