aboutsummaryrefslogtreecommitdiff
path: root/src/Haddock
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2012-01-03 18:31:29 +0000
committerIan Lynagh <igloo@earth.li>2012-01-03 18:31:29 +0000
commit57491ab4ac6263d9d9a11e972e7a95c840c299de (patch)
tree0b895b6c41b6b3e6ddbd49cfc3aed9b389614897 /src/Haddock
parent949849c3fde2ea2838b143717f250c4cce9e026e (diff)
Follow rename of Instance to ClsInst in GHC
Diffstat (limited to 'src/Haddock')
-rw-r--r--src/Haddock/Backends/Hoogle.hs2
-rw-r--r--src/Haddock/Interface/AttachInstances.hs2
-rw-r--r--src/Haddock/Interface/Create.hs8
-rw-r--r--src/Haddock/Types.hs2
4 files changed, 7 insertions, 7 deletions
diff --git a/src/Haddock/Backends/Hoogle.hs b/src/Haddock/Backends/Hoogle.hs
index 6e3e306a..593f03bc 100644
--- a/src/Haddock/Backends/Hoogle.hs
+++ b/src/Haddock/Backends/Hoogle.hs
@@ -150,7 +150,7 @@ ppClass x = out x{tcdSigs=[]} :
(map (reL . HsTyVar . hsTyVarName . unL) (tcdTyVars x))
-ppInstance :: Instance -> [String]
+ppInstance :: ClsInst -> [String]
ppInstance x = [dropComment $ out x]
diff --git a/src/Haddock/Interface/AttachInstances.hs b/src/Haddock/Interface/AttachInstances.hs
index c012f2e0..90416cd0 100644
--- a/src/Haddock/Interface/AttachInstances.hs
+++ b/src/Haddock/Interface/AttachInstances.hs
@@ -91,7 +91,7 @@ lookupInstDoc name iface ifaceMap instIfaceMap =
-- | Like GHC's getInfo but doesn't cut things out depending on the
-- interative context, which we don't set sufficiently anyway.
-getAllInfo :: GhcMonad m => Name -> m (Maybe (TyThing,Fixity,[Instance]))
+getAllInfo :: GhcMonad m => Name -> m (Maybe (TyThing,Fixity,[ClsInst]))
getAllInfo name = withSession $ \hsc_env -> do
(_msgs, r) <- liftIO $ tcRnGetInfo hsc_env name
return r
diff --git a/src/Haddock/Interface/Create.hs b/src/Haddock/Interface/Create.hs
index 580aaa83..e51c8367 100644
--- a/src/Haddock/Interface/Create.hs
+++ b/src/Haddock/Interface/Create.hs
@@ -160,7 +160,7 @@ parseOption other = tell ["Unrecognised option: " ++ other] >> return Nothing
type Maps = (DocMap Name, ArgMap Name, SubMap, DeclMap)
-mkMaps :: DynFlags -> GlobalRdrEnv -> [Instance] -> [Name] -> [(LHsDecl Name, [HsDocString])] -> ErrMsgM Maps
+mkMaps :: DynFlags -> GlobalRdrEnv -> [ClsInst] -> [Name] -> [(LHsDecl Name, [HsDocString])] -> ErrMsgM Maps
mkMaps dflags gre instances exports decls = do
maps <- mapM f decls
let mergeMaps (a,b,c,d) (x,y,z,w) =
@@ -201,10 +201,10 @@ mkMaps dflags gre instances exports decls = do
-- Note [2]:
------------
--- We relate Instances to InstDecls using the SrcSpans buried inside them.
+-- We relate ClsInsts to InstDecls using the SrcSpans buried inside them.
-- That should work for normal user-written instances (from looking at GHC
-- sources). We can assume that commented instances are user-written.
--- This lets us relate Names (from Instances) to comments (associated
+-- This lets us relate Names (from ClsInsts) to comments (associated
-- with InstDecls).
@@ -384,7 +384,7 @@ mkExportItems
-> [LHsDecl Name]
-> Maps
-> Maybe [IE Name]
- -> [Instance]
+ -> [ClsInst]
-> InstIfaceMap
-> DynFlags
-> ErrMsgGhc [ExportItem Name]
diff --git a/src/Haddock/Types.hs b/src/Haddock/Types.hs
index a3a7db15..20b1182b 100644
--- a/src/Haddock/Types.hs
+++ b/src/Haddock/Types.hs
@@ -105,7 +105,7 @@ data Interface = Interface
, ifaceVisibleExports :: ![Name]
-- | Instances exported by the module.
- , ifaceInstances :: ![Instance]
+ , ifaceInstances :: ![ClsInst]
-- | The number of haddockable and haddocked items in the module, as a
-- tuple. Haddockable items are the exports and the module itself.