From: Thomas Schilling Date: Sun, 20 Jul 2008 17:17:23 +0000 (+0000) Subject: Fix Haddock errors. X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=cb8f0e566e65c1e54de43174668fa3531970c8f5 Fix Haddock errors. --- diff --git a/compiler/iface/LoadIface.lhs b/compiler/iface/LoadIface.lhs index 73b0222..66cdf78 100644 --- a/compiler/iface/LoadIface.lhs +++ b/compiler/iface/LoadIface.lhs @@ -408,7 +408,7 @@ loadDecl ignore_prags mod (_version, decl) -- All a bit too finely-balanced for my liking. -- This mini-env and lookup function mediates between the - -- *Name*s n and the map from *OccName*s to the implicit TyThings + --'Name's n and the map from 'OccName's to the implicit TyThings ; let mini_env = mkOccEnv [(getOccName t, t) | t <- implicitTyThings thing] lookup n = case lookupOccEnv mini_env (getOccName n) of Just thing -> thing diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs index f7f7348..17254d6 100644 --- a/compiler/iface/MkIface.lhs +++ b/compiler/iface/MkIface.lhs @@ -1116,13 +1116,13 @@ needInterface mod continue -- Instead, get an Either back which we can test case mb_iface of - Failed _ -> (out_of_date (sep [ptext (sLit "Couldn't load interface for module"), - ppr mod])); - -- Couldn't find or parse a module mentioned in the - -- old interface file. Don't complain: it might - -- just be that the current module doesn't need that - -- import and it's been deleted - Succeeded iface -> continue iface + Failed _ -> (out_of_date (sep [ptext (sLit "Couldn't load interface for module"), + ppr mod])) + -- Couldn't find or parse a module mentioned in the + -- old interface file. Don't complain: it might + -- just be that the current module doesn't need that + -- import and it's been deleted + Succeeded iface -> continue iface checkModUsage :: PackageId ->Usage -> IfG RecompileRequired diff --git a/compiler/iface/TcIface.lhs b/compiler/iface/TcIface.lhs index 43ec524..c572afe 100644 --- a/compiler/iface/TcIface.lhs +++ b/compiler/iface/TcIface.lhs @@ -525,7 +525,7 @@ tcIfaceFamInst :: IfaceFamInst -> IfL FamInst tcIfaceFamInst (IfaceFamInst { ifFamInstTyCon = tycon, ifFamInstFam = fam, ifFamInstTys = mb_tcs }) -- { tycon' <- forkM (ptext (sLit "Inst tycon") <+> ppr tycon) $ --- ^^^this line doesn't work, but vvv this does => CPP in Haskell = evil! +-- the above line doesn't work, but this below does => CPP in Haskell = evil! = do tycon' <- forkM (text ("Inst tycon") <+> ppr tycon) $ tcIfaceTyCon tycon let mb_tcs' = map (fmap ifaceTyConName) mb_tcs