FIX #1465, error messages could sometimes say things like "A.T doesn't match A.T"

[ghc-hetmet.git] / compiler / ghci / GhciTags.hs

diff --git a/compiler/ghci/GhciTags.hs b/compiler/ghci/GhciTags.hs
index 1c5295a..a974c01 100644 (file)
--- a/compiler/ghci/GhciTags.hs
+++ b/compiler/ghci/GhciTags.hs
@@ -25,6 +25,7 @@ import Util
 import Name (nameOccName)
 import OccName (pprOccName)
 
+import Data.Maybe
 import Control.Exception
 import Data.List
 import Control.Monad
@@ -69,11 +70,13 @@ createTagsFile session tagskind tagFile = do
                                 ++ GHC.moduleNameString (GHC.moduleName m)
                                 ++ "' is not interpreted"))
         mbModInfo <- GHC.getModuleInfo session m
-        let unqual 
-             | Just modinfo <- mbModInfo,
-               Just unqual <- GHC.modInfoPrintUnqualified modinfo = unqual
-             | otherwise = GHC.alwaysQualify
-
+        unqual <-
+          case mbModInfo of
+             Just minf -> do
+                mb_print_unqual <- GHC.mkPrintUnqualifiedForModule session minf
+                return (fromMaybe GHC.alwaysQualify mb_print_unqual)
+             Nothing ->
+                return GHC.alwaysQualify
         case mbModInfo of 
           Just modInfo -> return $! listTags unqual modInfo 
           _            -> return []