Merge branch 'ghc-7.6' into ghc-7.6-merge-2

Conflicts:
	haddock.cabal
	src/Haddock/Interface/AttachInstances.hs
	src/Haddock/Interface/Create.hs
	src/Haddock/Interface/LexParseRn.hs
	src/Haddock/InterfaceFile.hs
	src/Haddock/Types.hs

Only GHC HEAD can compile this. GHC 7.6.x cannot compile this.

Some test fail.

1 files changed, 11 insertions, 4 deletions

diff --git a/src/Documentation/Haddock.hs b/src/Documentation/Haddock.hs
index 60bb3147..36115a2a 100644
--- a/src/Documentation/Haddock.hs
+++ b/src/Documentation/Haddock.hs
@@ -35,7 +35,13 @@ module Documentation.Haddock (
   -- * Documentation comments
   Doc(..),
   Example(..),
+  Hyperlink(..),
   DocMarkup(..),
+  Documentation(..),
+  ArgMap,
+  AliasMap,
+  WarningMap,
+  DocMap,
   HaddockModInfo(..),
   markup,
 
@@ -48,8 +54,10 @@ module Documentation.Haddock (
 
   -- * Flags and options
   Flag(..),
-  DocOption(..)
+  DocOption(..),
 
+  -- * Program entry point
+  haddock,
 ) where
 
 
@@ -58,7 +66,7 @@ import Haddock.Interface
 import Haddock.Types
 import Haddock.Options
 import Haddock.Utils
-import Main
+import Haddock
 
 
 -- | Create 'Interface' structures from a given list of Haddock command-line
@@ -70,6 +78,5 @@ createInterfaces
   -> [String]       -- ^ File or module names
   -> IO [Interface] -- ^ Resulting list of interfaces
 createInterfaces flags modules = do
-  (_, ifaces, _) <- readPackagesAndProcessModules flags modules
+  (_, ifaces, _) <- withGhc' flags (readPackagesAndProcessModules flags modules)
   return ifaces
-