[project @ 2005-06-29 16:04:04 by simonpj]

Vital wibble to last commit!

diff --git a/ghc/compiler/basicTypes/RdrName.lhs b/ghc/compiler/basicTypes/RdrName.lhs
index 4136914..d04aa6f 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})