From 480f09d1ce43853eb3849edd7503ecee60fe036e Mon Sep 17 00:00:00 2001
From: davve <davve@dtek.chalmers.se>
Date: Thu, 28 Dec 2006 13:22:24 +0000
Subject: Update to build with latest GHC HEAD

---
 src/HaddockTypes.hs | 2 +-
 src/HaddockUtil.hs  | 2 +-
 src/Main.hs         | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/HaddockTypes.hs b/src/HaddockTypes.hs
index 52cea181..9c04c6e2 100644
--- a/src/HaddockTypes.hs
+++ b/src/HaddockTypes.hs
@@ -35,7 +35,7 @@ data ExportItem name
       Name                 -- ^ The original name
       (LHsDecl name)       -- ^ A declaration
       (Maybe (HsDoc name)) -- ^ Maybe a doc comment
-      [InstHead name]	   -- ^ Instances relevant to this declaration
+      [InstHead name]	     -- ^ Instances relevant to this declaration
 
   | ExportNoDecl           -- ^ An exported entity for which we have no 
                            -- documentation (perhaps because it resides in
diff --git a/src/HaddockUtil.hs b/src/HaddockUtil.hs
index 7fe6f796..7cdca748 100644
--- a/src/HaddockUtil.hs
+++ b/src/HaddockUtil.hs
@@ -320,7 +320,7 @@ instance Binary FormatVersion where
                ++ " is not allowed")
    get bh =
       do
-         w8 :: Word8 <- get bh   
+         (w8 :: Word8) <- get bh   
          if testBit w8 7
             then
                do
diff --git a/src/Main.hs b/src/Main.hs
index 94ea575b..3cf46375 100644
--- a/src/Main.hs
+++ b/src/Main.hs
@@ -440,8 +440,8 @@ type FullyCheckedMod = (ParsedSource,
 printEntity (DocEntity doc) = show doc
 printEntity (DeclEntity name) = show $ ppr name defaultUserStyle
 
--- | This data structure collects all the information we need from the GHC API
--- about a home package module
+-- | This data structure collects all the information we need about a home 
+-- package module
 data ModuleDataGHC = ModuleDataGHC {
    ghcModule         :: Module,
    ghcFilename       :: FilePath,
@@ -994,7 +994,8 @@ buildGlobalDocEnv modules
 			 n (nameSetMod n modName) env
 	keep_new env n = Map.insert n (nameSetMod n modName) env 
 
-nameSetMod n newMod = mkExternalName (nameUnique n) newMod (nameOccName n) Nothing (nameSrcLoc n)
+nameSetMod n newMod = mkExternalName (nameUnique n) newMod (nameOccName n)
+                      (nameSrcLoc n)
 
 -- -----------------------------------------------------------------------------
 -- Named documentation
@@ -1094,7 +1095,6 @@ sortImage f xs = map snd $ sortBy cmp_fst [(f x, x) | x <- xs]
 funTyConName = mkWiredInName gHC_PRIM
                         (mkOccNameFS tcName FSLIT("(->)"))
                         funTyConKey
-                        Nothing                 -- No parent object
                         (ATyCon funTyCon)       -- Relevant TyCon
                         BuiltInSyntax
 
-- 
cgit v1.2.3