[Pkg-haskell-commits] darcs: ghc: Refresh getallinfo-nothing-ghci-566331 (TODO: still needed?)

[Joachim Breitner]

Sat Jan 15 07:02:31 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh getallinfo-nothing-ghci-566331 (TODO: still needed?)
  Ignore-this: 1ae3e6e50777f457f0c00e684be4d8a8

    M ./patches/getallinfo-nothing-ghci-566331 -23 +23

Sat Jan 15 07:02:31 UTC 2011  Joachim Breitner <mail at joachim-breitner.de>
  * Refresh getallinfo-nothing-ghci-566331 (TODO: still needed?)
  Ignore-this: 1ae3e6e50777f457f0c00e684be4d8a8
diff -rN -u old-ghc/patches/getallinfo-nothing-ghci-566331 new-ghc/patches/getallinfo-nothing-ghci-566331
--- old-ghc/patches/getallinfo-nothing-ghci-566331	2011-01-15 07:12:59.315594783 +0000
+++ new-ghc/patches/getallinfo-nothing-ghci-566331	2011-01-15 07:12:59.327595415 +0000
@@ -1,31 +1,31 @@
-Index: ghc6-6.12.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs
+Index: ghc-7.0.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs
 ===================================================================
---- ghc6-6.12.1.orig/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2010-01-27 22:13:25.000000000 +0200
-+++ ghc6-6.12.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2010-01-27 22:19:17.000000000 +0200
-@@ -25,7 +25,9 @@
+--- ghc-7.0.1.orig/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2010-11-12 23:40:08.000000000 +0530
++++ ghc-7.0.1/utils/haddock/src/Haddock/Interface/AttachInstances.hs	2011-01-15 12:32:21.000000000 +0530
+@@ -26,7 +26,9 @@
  import InstEnv
  import Class
  import HscTypes (withSession, ioMsg)
 +#ifdef GHCI
  import TcRnDriver (tcRnGetInfo)
 +#endif
- 
- #if __GLASGOW_HASKELL__ > 610 || (__GLASGOW_HASKELL__ == 610 && __GHC_PATCHLEVEL__ >= 2)
  import TypeRep hiding (funTyConName)
-@@ -48,7 +50,11 @@
-       return $ iface { ifaceExportItems = newItems }
- 
-     attachExport export at ExportDecl{expItemDecl = L _ (TyClD d)} = do
-+#ifdef GHCI
-        mb_info <- getAllInfo (unLoc (tcdLName d))
+ import Var hiding (varName)
+ import TyCon
+@@ -51,7 +53,11 @@
+ attachToExportItem iface ifaceMap instIfaceMap export =
+   case export of
+     ExportDecl { expItemDecl = L _ (TyClD d) } -> do
++#ifdef GHCI    
+       mb_info <- getAllInfo (unLoc (tcdLName d))
 +#else
-+       let mb_info = Nothing
++      let mb_info = Nothing
 +#endif
-        return $ export { expItemInstances = case mb_info of
-          Just (_, _, instances) ->
-            map synifyInstHead . sortImage instHead . map instanceHead $ instances
-@@ -58,10 +64,12 @@
-     attachExport export = return export
+       let export' =
+             export {
+               expItemInstances =
+@@ -90,10 +96,12 @@
+     modName = nameModule name
  
  
 +#ifdef GHCI
@@ -35,13 +35,13 @@
  getAllInfo name = withSession $ \hsc_env -> ioMsg $ tcRnGetInfo hsc_env name
 +#endif
  
+ 
  --------------------------------------------------------------------------------
- -- Collecting and sorting instances
-Index: ghc6-6.12.1/utils/haddock/src/Haddock/Interface/Create.hs
+Index: ghc-7.0.1/utils/haddock/src/Haddock/Interface/Create.hs
 ===================================================================
---- ghc6-6.12.1.orig/utils/haddock/src/Haddock/Interface/Create.hs	2010-01-28 10:28:29.000000000 +0200
-+++ ghc6-6.12.1/utils/haddock/src/Haddock/Interface/Create.hs	2010-01-28 10:29:26.000000000 +0200
-@@ -495,7 +495,11 @@
+--- ghc-7.0.1.orig/utils/haddock/src/Haddock/Interface/Create.hs	2010-11-12 23:40:08.000000000 +0530
++++ ghc-7.0.1/utils/haddock/src/Haddock/Interface/Create.hs	2011-01-15 12:31:28.000000000 +0530
+@@ -506,7 +506,11 @@
          Nothing -> do
            -- If we can't find the declaration, it must belong to
            -- another package