aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2015-12-12 17:20:15 +0100
committerBen Gamari <ben@smart-cactus.org>2015-12-15 23:45:05 +0100
commitd4657f07912416a1b14ddb517696f8ef3ffb85a7 (patch)
tree3812d21d3ccefb4ab80fe506d2773dad04c50a0d
parent0fc8cfd532f5dfd12b5504f44a2b3c9fb659cd87 (diff)
Update for D1200
-rw-r--r--haddock-api/haddock-api.cabal1
-rw-r--r--haddock-api/src/Haddock/Interface/LexParseRn.hs5
-rw-r--r--haddock-api/src/Haddock/Types.hs5
-rw-r--r--haddock.cabal1
4 files changed, 8 insertions, 4 deletions
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index dc3e8c69..292965bf 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -45,6 +45,7 @@ library
, array
, xhtml >= 3000.2 && < 3000.3
, Cabal >= 1.10
+ , ghc-boot
, ghc == 7.9.*
, ghc-paths
diff --git a/haddock-api/src/Haddock/Interface/LexParseRn.hs b/haddock-api/src/Haddock/Interface/LexParseRn.hs
index ac823da3..9c46c700 100644
--- a/haddock-api/src/Haddock/Interface/LexParseRn.hs
+++ b/haddock-api/src/Haddock/Interface/LexParseRn.hs
@@ -22,7 +22,8 @@ import Control.Applicative
import Data.IntSet (toList)
import Data.List
import Documentation.Haddock.Doc (metaDocConcat)
-import DynFlags (ExtensionFlag(..), languageExtensions)
+import DynFlags (languageExtensions)
+import qualified GHC.LanguageExtensions as LangExt
import FastString
import GHC
import Haddock.Interface.ParseModuleHeader
@@ -65,7 +66,7 @@ processModuleHeader dflags gre safety mayStr = do
doc' = overDoc (rename dflags gre) doc
return (hmi', Just doc')
- let flags :: [ExtensionFlag]
+ let flags :: [LangExt.Extension]
-- We remove the flags implied by the language setting and we display the language instead
flags = map toEnum (toList $ extensionFlags dflags) \\ languageExtensions (language dflags)
return (hmi { hmi_safety = Just $ showPpr dflags safety
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index f667b52c..6305dba1 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -31,7 +31,8 @@ import qualified Data.Map as Map
import Documentation.Haddock.Types
import BasicTypes (Fixity(..))
import GHC hiding (NoLink)
-import DynFlags (ExtensionFlag, Language)
+import DynFlags (Language)
+import qualified GHC.LanguageExtensions as LangExt
import OccName
import Outputable
import NameSet (NameSet)
@@ -400,7 +401,7 @@ data HaddockModInfo name = HaddockModInfo
, hmi_portability :: Maybe String
, hmi_safety :: Maybe String
, hmi_language :: Maybe Language
- , hmi_extensions :: [ExtensionFlag]
+ , hmi_extensions :: [LangExt.Extension]
}
diff --git a/haddock.cabal b/haddock.cabal
index 56e62e60..dc331b2f 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -57,6 +57,7 @@ executable haddock
array,
xhtml >= 3000.2 && < 3000.3,
Cabal >= 1.10,
+ ghc-boot,
ghc >= 7.11 && < 7.13,
bytestring,
transformers