diff options
| author | davve <davve@dtek.chalmers.se> | 2006-09-22 20:35:40 +0000 |
|---|---|---|
| committer | davve <davve@dtek.chalmers.se> | 2006-09-22 20:35:40 +0000 |
| commit | 3fb955471974728f78506fe5d526cdaa08afa556 (patch) | |
| tree | 4617d5cbef19a076af76a43d2005dc0bbb627c99 /src/HaddockRename.hs | |
| parent | c53964436b2c5725e21371943cb07582e5c6d3a3 (diff) | |
Take away trailin "2" on all previously clashing type names
Diffstat (limited to 'src/HaddockRename.hs')
| -rw-r--r-- | src/HaddockRename.hs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/HaddockRename.hs b/src/HaddockRename.hs index 65af08e8..a5e2daa5 100644 --- a/src/HaddockRename.hs +++ b/src/HaddockRename.hs @@ -76,7 +76,7 @@ keepL (L loc n) = L loc (NoLink n) rename = lookupRn id renameL (L loc name) = return . L loc =<< rename name -renameExportItems :: [ExportItem2 Name] -> RnM [ExportItem2 DocName] +renameExportItems :: [ExportItem Name] -> RnM [ExportItem DocName] renameExportItems items = mapM renameExportItem items renameMaybeDoc :: Maybe (HsDoc Name) -> RnM (Maybe (HsDoc DocName)) @@ -199,7 +199,7 @@ renameLContext (L loc context) = do context' <- mapM renameLPred context return (L loc context') -renameInstHead :: InstHead2 Name -> RnM (InstHead2 DocName) +renameInstHead :: InstHead Name -> RnM (InstHead DocName) renameInstHead (preds, className, types) = do preds' <- mapM renamePred preds className' <- rename className @@ -301,21 +301,21 @@ renameForD (ForeignExport lname ltype x) = do ltype' <- renameLType ltype return (ForeignExport (keepL lname) ltype' x) -renameExportItem :: ExportItem2 Name -> RnM (ExportItem2 DocName) +renameExportItem :: ExportItem Name -> RnM (ExportItem DocName) renameExportItem item = case item of - ExportModule2 mod -> return (ExportModule2 mod) - ExportGroup2 lev id doc -> do + ExportModule mod -> return (ExportModule mod) + ExportGroup lev id doc -> do doc' <- renameDoc doc - return (ExportGroup2 lev id doc') - ExportDecl2 x decl doc instances -> do + return (ExportGroup lev id doc') + ExportDecl x decl doc instances -> do decl' <- renameLDecl decl doc' <- mapM renameDoc doc instances' <- mapM renameInstHead instances - return (ExportDecl2 x decl' doc' instances') - ExportNoDecl2 x y subs -> do + return (ExportDecl x decl' doc' instances') + ExportNoDecl x y subs -> do y' <- lookupRn id y subs' <- mapM (lookupRn id) subs - return (ExportNoDecl2 x y' subs') - ExportDoc2 doc -> do + return (ExportNoDecl x y' subs') + ExportDoc doc -> do doc' <- renameDoc doc - return (ExportDoc2 doc') + return (ExportDoc doc') |