[commit: ghc] ghc-instvis: Special case interactive package key for mkQualPackage. (46c53d5)

git at git.haskell.org git at git.haskell.org
Sun Nov 30 09:37:44 UTC 2014


Repository : ssh://git@git.haskell.org/ghc

On branch  : ghc-instvis
Link       : http://ghc.haskell.org/trac/ghc/changeset/46c53d5ce5a1d00f29ffea0c3741d972e4beab97/ghc

>---------------------------------------------------------------

commit 46c53d5ce5a1d00f29ffea0c3741d972e4beab97
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Nov 18 04:17:57 2014 -0800

    Special case interactive package key for mkQualPackage.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


>---------------------------------------------------------------

46c53d5ce5a1d00f29ffea0c3741d972e4beab97
 compiler/main/HscTypes.lhs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/main/HscTypes.lhs b/compiler/main/HscTypes.lhs
index 0c73c14..bb3fd38 100644
--- a/compiler/main/HscTypes.lhs
+++ b/compiler/main/HscTypes.lhs
@@ -1494,7 +1494,7 @@ mkQualModule dflags mod
 -- with a package key if the package ID would be ambiguous.
 mkQualPackage :: DynFlags -> QueryQualifyPackage
 mkQualPackage dflags pkg_key
-     | pkg_key == mainPackageKey
+     | pkg_key == mainPackageKey || pkg_key == interactivePackageKey
         -- Skip the lookup if it's main, since it won't be in the package
         -- database!
      = False



More information about the ghc-commits mailing list