Various fixups and bumps for next release

12 files changed, 23 insertions, 34 deletions

diff --git a/.travis.yml b/.travis.yml
index ce6d6809..ad1331f8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,8 +1,8 @@
 language: haskell
 
 env:
- - GHCVER=7.8.2
- - GHCVER=7.8.3
+ # - GHCVER=7.8.2
+ # - GHCVER=7.8.3
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
diff --git a/CHANGES b/CHANGES
index 79a7e657..2dd563dd 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,4 @@
-Changes in version 2.15.1
+Changes in version 2.16.0
 
  * Experimental collapsible header support (#335)
 
diff --git a/ghc.mk b/ghc.mk
index 247c16ec..e8bf7360 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -26,11 +26,11 @@ $(INPLACE_BIN)/$(utils/haddock_dist_PROG): $(INPLACE_LIB)/html $(INPLACE_LIB)/la
 
 $(INPLACE_LIB)/html:
 	$(call removeTrees,$@)
-	"$(CP)" -RL utils/haddock/resources/html $@
+	"$(CP)" -RL utils/haddock/haddock-api/resources/html $@
 
 $(INPLACE_LIB)/latex:
 	$(call removeTrees,$@)
-	"$(CP)" -RL utils/haddock/resources/latex $@
+	"$(CP)" -RL utils/haddock/haddock-api/resources/latex $@
 
 endif
 
@@ -48,7 +48,7 @@ install_utils/haddock_data:
 	$(foreach i,$(sort $(dir $(utils/haddock_dist_DATA_FILES))), \
 	    $(call make-command,$(call INSTALL_DIR,"$(DESTDIR)$(ghclibdir)/$i")))
 	$(foreach i,$(utils/haddock_dist_DATA_FILES), \
-	    $(call make-command,$(call INSTALL_DATA,$(INSTALL_OPTS),utils/haddock/resources/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)")))
+	    $(call make-command,$(call INSTALL_DATA,$(INSTALL_OPTS),utils/haddock/haddock-api/resources/$i,"$(DESTDIR)$(ghclibdir)/$(dir $i)")))
 
 .PHONY: install_utils/haddock_link
 install_utils/haddock_link:
@@ -56,4 +56,3 @@ install_utils/haddock_link:
 	$(LN_S) $(utils/haddock_dist_INSTALL_SHELL_WRAPPER_NAME) "$(DESTDIR)$(bindir)/haddock"
 
 BINDIST_EXTRAS += $(addprefix utils/haddock/resources/,$(utils/haddock_dist_DATA_FILES))
-
diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index d18a30e4..57a20117 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -1,5 +1,5 @@
 name:                 haddock-api
-version:              2.15.1
+version:              2.16.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -45,10 +45,10 @@ library
     , array
     , xhtml >= 3000.2 && < 3000.3
     , Cabal >= 1.10
-    , ghc >= 7.8.2 && < 7.8.4
+    , ghc == 7.9.*
 
     , ghc-paths
-    , haddock-library == 1.1.1.*
+    , haddock-library == 1.20.0.*
 
   hs-source-dirs:
       src
diff --git a/haddock-api/src/Haddock/Backends/Hoogle.hs b/haddock-api/src/Haddock/Backends/Hoogle.hs
index 2db70c9f..dd10bb0a 100644
--- a/haddock-api/src/Haddock/Backends/Hoogle.hs
+++ b/haddock-api/src/Haddock/Backends/Hoogle.hs
@@ -17,7 +17,7 @@ module Haddock.Backends.Hoogle (
 
 
 import Haddock.GhcUtils
-import Haddock.Types
+import Haddock.Types hiding (Version)
 import Haddock.Utils hiding (out)
 import GHC
 import Outputable
diff --git a/haddock-api/src/Haddock/Backends/Xhtml.hs b/haddock-api/src/Haddock/Backends/Xhtml.hs
index e90be796..65a7e6c4 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml.hs
@@ -35,9 +35,6 @@ import Text.XHtml hiding ( name, title, p, quote )
 import Haddock.GhcUtils
 
 import Control.Monad         ( when, unless )
-#if !MIN_VERSION_base(4,7,0)
-import Control.Monad.Instances ( ) -- for Functor Either a
-#endif
 import Data.Char             ( toUpper )
 import Data.Functor          ( (<$>) )
 import Data.List             ( sortBy, groupBy, intercalate, isPrefixOf )
diff --git a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
index a75553b8..3bf4322d 100644
--- a/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
+++ b/haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
@@ -828,9 +828,8 @@ ppKind unicode qual ki = ppr_mono_ty pREC_TOP ki unicode qual
 
 ppForAllCon :: HsExplicitFlag -> LHsTyVarBndrs DocName
          -> Located (HsContext DocName) -> Unicode -> Qualification -> Html
-ppForAllCon expl tvs cxt unicode qual
-  | show_forall = forall_part <+> ppLContext cxt unicode qual
-  | otherwise   = ppLContext cxt unicode qual
+ppForAllCon expl tvs cxt unicode qual =
+  forall_part <+> ppLContext cxt unicode qual
   where
     forall_part = ppLTyVarBndrs expl tvs unicode qual
 
@@ -850,7 +849,7 @@ ppr_mono_lty ctxt_prec ty = ppr_mono_ty ctxt_prec (unLoc ty)
 
 
 ppr_mono_ty :: Int -> HsType DocName -> Unicode -> Qualification -> Html
-ppr_mono_ty ctxt_prec (HsForAllTy expl tvs ctxt ty) unicode qual
+ppr_mono_ty ctxt_prec (HsForAllTy expl extra tvs ctxt ty) unicode qual
   = maybeParen ctxt_prec pREC_FUN $ ppForAllCon expl tvs ctxt' unicode qual
                                     <+> ppr_mono_lty pREC_TOP ty unicode qual
  where ctxt' = case extra of
diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs
index 175fe8b5..98a715a9 100644
--- a/haddock-api/src/Haddock/Interface/Create.hs
+++ b/haddock-api/src/Haddock/Interface/Create.hs
@@ -365,11 +365,7 @@ classDecls class_ = filterDecls . collectDocs . sortByLoc $ decls
   where
     decls = docs ++ defs ++ sigs ++ ats
     docs  = mkDecls tcdDocs DocD class_
-#if MIN_VERSION_ghc(7,8,3)
     defs  = mkDecls (bagToList . tcdMeths) ValD class_
-#else
-    defs  = mkDecls (map snd . bagToList . tcdMeths) ValD class_
-#endif
     sigs  = mkDecls tcdSigs SigD class_
     ats   = mkDecls tcdATs (TyClD . FamDecl) class_
 
@@ -396,11 +392,7 @@ ungroup group_ =
   mkDecls hs_docs                DocD   group_ ++
   mkDecls hs_instds              InstD  group_ ++
   mkDecls (typesigs . hs_valds)  SigD   group_ ++
-#if MIN_VERSION_ghc(7,8,3)
   mkDecls (valbinds . hs_valds)  ValD   group_
-#else
-  mkDecls (map snd . valbinds . hs_valds)  ValD   group_
-#endif
   where
     typesigs (ValBindsOut _ sigs) = filter isVanillaLSig sigs
     typesigs _ = error "expected ValBindsOut"
diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index a4d2d864..ad006353 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -76,8 +76,8 @@ binaryInterfaceMagic = 0xD0Cface
 -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion]
 --
 binaryInterfaceVersion :: Word16
-#if __GLASGOW_HASKELL__ == 708
-binaryInterfaceVersion = 26
+#if __GLASGOW_HASKELL__ == 709
+binaryInterfaceVersion = 27
 
 binaryInterfaceVersionCompatibility :: [Word16]
 binaryInterfaceVersionCompatibility = [binaryInterfaceVersion]
diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal
index 83aad2da..b0f886cd 100644
--- a/haddock-library/haddock-library.cabal
+++ b/haddock-library/haddock-library.cabal
@@ -1,5 +1,5 @@
 name:                 haddock-library
-version:              1.1.1
+version:              1.2.0
 synopsis:             Library exposing some functionality of Haddock.
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries. These modules expose some functionality of it
diff --git a/haddock.cabal b/haddock.cabal
index c1d7fdb2..8153af1b 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -1,5 +1,5 @@
 name:                 haddock
-version:              2.15.1
+version:              2.16.0
 synopsis:             A documentation-generation tool for Haskell libraries
 description:          Haddock is a documentation-generation tool for Haskell
                       libraries
@@ -57,11 +57,13 @@ executable haddock
       array,
       xhtml >= 3000.2 && < 3000.3,
       Cabal >= 1.10,
-      ghc == 7.8.3,
-      bytestring
+      ghc == 7.9.*,
+      bytestring,
+      transformers
 
     other-modules:
       Documentation.Haddock.Parser
+      Documentation.Haddock.Parser.Monad
       Documentation.Haddock.Types
       Documentation.Haddock.Doc
       Data.Attoparsec
@@ -108,7 +110,7 @@ executable haddock
       Haddock.GhcUtils
       Haddock.Convert
   else
-    build-depends:  haddock-api == 2.15.1
+    build-depends:  haddock-api == 2.16.0
 
 test-suite html-test
   type:             exitcode-stdio-1.0
diff --git a/html-test/run.lhs b/html-test/run.lhs
index a8664363..a80b265e 100755
--- a/html-test/run.lhs
+++ b/html-test/run.lhs
@@ -54,7 +54,7 @@ test = do
   let mods' = map (testDir </>) mods
 
   -- add haddock_datadir to environment for subprocesses
-  env <- Just . (:) ("haddock_datadir", dataDir) <$> getEnvironment
+  env <- Just . (:) ("haddock_datadir", Main.dataDir) <$> getEnvironment
 
   putStrLn ""
   putStrLn "Haddock version: "