X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Frename%2FRnEnv.lhs;h=63db61ccb646e766e7529786b62f29d50d03b17d;hb=c2def8304ba7c48c4a3e652a63f136ebcd453674;hp=4d2ee53892303ae7011d5f7ba13938e314e09221;hpb=4385caba003064bb556f965b32fdc962ea19ea69;p=ghc-hetmet.git

diff --git a/compiler/rename/RnEnv.lhs b/compiler/rename/RnEnv.lhs
index 4d2ee53..63db61c 100644
--- a/compiler/rename/RnEnv.lhs
+++ b/compiler/rename/RnEnv.lhs
@@ -322,7 +322,7 @@ lookupFamInstDeclBndr :: Module -> Located RdrName -> RnM Name
 lookupFamInstDeclBndr mod lrdr_name@(L _ rdr_name)
   = do { mb_gre <- lookupGreRn_maybe rdr_name
        ; case mb_gre of
-           Just gre -> returnM (gre_name gre) ;
+           Just gre -> returnM (gre_name gre)
 	   Nothing  -> newTopSrcBinder mod lrdr_name }
 
 --------------------------------------------------
@@ -359,23 +359,27 @@ lookupGlobalOccRn rdr_name
   = lookupImportedName rdr_name	
 
   | otherwise
-  =	-- First look up the name in the normal environment.
-   lookupGreRn_maybe rdr_name		`thenM` \ mb_gre ->
+  = do
+  	-- First look up the name in the normal environment.
+   mb_gre <- lookupGreRn_maybe rdr_name
    case mb_gre of {
 	Just gre -> returnM (gre_name gre) ;
-	Nothing   -> 
+	Nothing   -> do
 
 	-- 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.
-   getModule 		`thenM` \ mod ->
-   if isQual rdr_name && mod == iNTERACTIVE then	
-					-- This test is not expensive,
-	lookupQualifiedName rdr_name	-- and only happens for failed lookups
-   else	do
+   allow_qual <- doptM Opt_ImplicitImportQualified
+   mod <- getModule
+               -- This test is not expensive,
+               -- and only happens for failed lookups
+   if isQual rdr_name && allow_qual && mod == iNTERACTIVE
+      then lookupQualifiedName rdr_name
+      else do 
         traceRn $ text "lookupGlobalOccRn"
-	unboundName rdr_name }
+        unboundName rdr_name
+  }
 
 lookupImportedName :: RdrName -> TcRnIf m n Name
 -- Lookup the occurrence of an imported name