Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : ghc-7.4

http://hackage.haskell.org/trac/ghc/changeset/512c77b2042a1bc4662d2b49b80ac310b0b99d97

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

commit 512c77b2042a1bc4662d2b49b80ac310b0b99d97
Author: Paolo Capriotti <[email protected]>
Date:   Sat Mar 31 15:48:57 2012 +0100

    Respect package qualifier when validating imports in GHCi (#5979)
    
    MERGED from commit a39a19254003f593e49fa0b29c8a10444cc204c2

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

 ghc/InteractiveUI.hs |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index a2061c2..f88f910 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -1627,7 +1627,7 @@ remModulesFromContext as bs = do
 addImportToContext :: String -> GHCi ()
 addImportToContext str = do
   idecl <- GHC.parseImportDecl str
-  _ <- GHC.lookupModule (unLoc (ideclName idecl)) Nothing  -- #5836
+  _ <- GHC.lookupModule (unLoc (ideclName idecl)) (ideclPkgQual idecl)  -- 
#5836
   modifyGHCiState $ \st ->
      st { remembered_ctx = addNotSubsumed (IIDecl idecl) (remembered_ctx st)
         , transient_ctx = filter (not . ((IIDecl idecl) `iiSubsumes`))



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to