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, 49 insertions, 0 deletions

diff --git a/html-test/accept.lhs b/html-test/accept.lhs
new file mode 100755
index 00000000..f6dfc4cd
--- /dev/null
+++ b/html-test/accept.lhs
@@ -0,0 +1,49 @@
+#!/usr/bin/env runhaskell
+\begin{code}
+{-# LANGUAGE CPP #-}
+import System.Cmd
+import System.Environment
+import System.FilePath
+import System.Directory
+import Data.List
+import Control.Applicative
+
+baseDir = takeDirectory __FILE__
+
+main :: IO ()
+main = do
+  contents <- filter (not . ignore) <$> getDirectoryContents (baseDir </> "out")
+  args <- getArgs
+  if not $ null args then
+    mapM_ copy [ baseDir </> "out" </> file | file <- contents, ".html" `isSuffixOf` file, takeBaseName file `elem` args  ]
+  else
+    mapM_ copy [ baseDir </> "out" </> file | file <- contents]
+  where
+    ignore =
+      foldr (liftA2 (||)) (const False) [
+        (== ".")
+      , (== "..")
+      , (isPrefixOf "index")
+      , (isPrefixOf "doc-index")
+      ]
+
+copy :: FilePath -> IO ()
+copy file = do
+  let new = baseDir </> "ref" </> takeFileName file
+  if ".html" `isSuffixOf` file then do
+    putStrLn (file ++ " -> " ++ new)
+    stripLinks <$> readFile file >>= writeFile new
+  else do
+    -- copy css, images, etc.
+    copyFile file new
+
+stripLinks :: String -> String
+stripLinks str =
+  let prefix = "<a href=\"" in
+  case stripPrefix prefix str of
+    Just str' -> prefix ++ stripLinks (dropWhile (/= '"') str')
+    Nothing ->
+      case str of
+        [] -> []
+        x : xs -> x : stripLinks xs
+\end{code}