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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/b23a7e55feb055f8b309ec3b5bb34526d951e969

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

commit b23a7e55feb055f8b309ec3b5bb34526d951e969
Author: David Terei <[email protected]>
Date:   Wed Feb 8 17:24:49 2012 -0800

    Don't allow implicit qualified imports in GHCi when -XSafe on.
    
    It would be better to actually check the safety of the import but doing
    that requires some significant refactoring of code so punting for
    another day.

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

 compiler/rename/RnEnv.lhs |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 7858525..ecd2cd3 100644
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -507,7 +507,12 @@ lookupOccRn_maybe rdr_name
        { -- We allow qualified names on the command line to refer to
          --  *any* name exported by any module in scope, just as if there
          -- was an "import qualified M" declaration for every module.
-         allow_qual <- doptM Opt_ImplicitImportQualified
+         -- But we DONT allow it under Safe Haskell as we need to check
+         -- imports. We can and should instead check the qualified import
+         -- but at the moment this requires some refactoring so leave as a TODO
+       ; dflags <- getDynFlags
+       ; let allow_qual = dopt Opt_ImplicitImportQualified dflags &&
+                          not (safeDirectImpsReq dflags)
        ; is_ghci <- getIsGHCi
                -- This test is not expensive,
                -- and only happens for failed lookups



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

Reply via email to