[project @ 2005-10-26 10:23:47 by simonpj]

[ghc-hetmet.git] / ghc / compiler / basicTypes / RdrName.lhs

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index 4136914..172485c 100644 (file)
--- a/ghc/compiler/basicTypes/RdrName.lhs
+++ b/ghc/compiler/basicTypes/RdrName.lhs
@@ -390,9 +390,10 @@ pickGREs rdr_name gres
        | is_unqual || m == mod = Just gre
        | otherwise             = Nothing
     pick gre@(GRE {gre_prov = Imported [is]})  -- Single import (efficiency)
-       | is_unqual && not (is_qual (is_decl is)) = Just gre
-       | mod == is_as (is_decl is)               = Just gre
-       | otherwise                               = Nothing
+       | is_unqual     = if not (is_qual (is_decl is)) then Just gre
+                                                       else Nothing
+       | otherwise     = if mod == is_as (is_decl is)  then Just gre
+                                                       else Nothing
     pick gre@(GRE {gre_prov = Imported is})    -- Multiple import
        | null filtered_is = Nothing
        | otherwise        = Just (gre {gre_prov = Imported filtered_is})
@@ -450,7 +451,7 @@ data Provenance
   = LocalDef           -- Defined locally
        Module
 
-  | Imported                           -- Imported
+  | Imported           -- Imported
        [ImportSpec]    -- INVARIANT: non-empty
 
 data ImportSpec = ImpSpec { is_decl :: ImpDeclSpec,