From e498b7871bfbee8b38858b546390246ddddb9509 Mon Sep 17 00:00:00 2001
From: Alexander Biehl <alexbiehl@gmail.com>
Date: Sun, 8 Oct 2017 15:32:28 +0200
Subject: Precise Haddock: Use Avails for export resolution (#688)

* Use Avails for export resolution

* Support reexported modules

* Factor out availExportItem

* Use avails for fullModuleExports

* Don't use subMap in attachInstances

* lookupDocs without subMap

* Completely remove subMap

* Only calculate unqualified modules when explicit export list is given

* Refactor

* Refine comment

* return

* Fix

* Refactoring

* Split avail if declaration is not exported itself

* Move avail splitting
---
 haddock-api/src/Haddock/InterfaceFile.hs | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'haddock-api/src/Haddock/InterfaceFile.hs')

diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 3b1a5f33..59582fd2 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -83,7 +83,7 @@ binaryInterfaceMagic = 0xD0Cface
 --
 binaryInterfaceVersion :: Word16
 #if (__GLASGOW_HASKELL__ >= 803) && (__GLASGOW_HASKELL__ < 805)
-binaryInterfaceVersion = 31
+binaryInterfaceVersion = 32
 
 binaryInterfaceVersionCompatibility :: [Word16]
 binaryInterfaceVersionCompatibility = [binaryInterfaceVersion]
@@ -373,7 +373,7 @@ instance Binary InterfaceFile where
 
 instance Binary InstalledInterface where
   put_ bh (InstalledInterface modu is_sig info docMap argMap
-           exps visExps opts subMap patSynMap fixMap) = do
+           exps visExps opts fixMap) = do
     put_ bh modu
     put_ bh is_sig
     put_ bh info
@@ -381,8 +381,6 @@ instance Binary InstalledInterface where
     put_ bh exps
     put_ bh visExps
     put_ bh opts
-    put_ bh subMap
-    put_ bh patSynMap
     put_ bh fixMap
 
   get bh = do
@@ -393,12 +391,9 @@ instance Binary InstalledInterface where
     exps    <- get bh
     visExps <- get bh
     opts    <- get bh
-    subMap  <- get bh
-    patSynMap <- get bh
     fixMap  <- get bh
-
     return (InstalledInterface modu is_sig info docMap argMap
-            exps visExps opts subMap patSynMap fixMap)
+            exps visExps opts fixMap)
 
 
 instance Binary DocOption where
-- 
cgit v1.2.3