From: sof <unknown>
Date: Wed, 4 Mar 1998 10:16:05 +0000 (+0000)
Subject: [project @ 1998-03-04 10:16:05 by sof]
X-Git-Tag: Approx_2487_patches~890
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=49f39f6d5c8a70084d01aea96dbfb95306aa672a;p=ghc-hetmet.git

[project @ 1998-03-04 10:16:05 by sof]
addAvailEnv: restrict previous change to not redo
duplicate checks.
---

diff --git a/ghc/compiler/rename/RnNames.lhs b/ghc/compiler/rename/RnNames.lhs
index 127eef7..25d28e0 100644
--- a/ghc/compiler/rename/RnNames.lhs
+++ b/ghc/compiler/rename/RnNames.lhs
@@ -419,10 +419,11 @@ addAvailEnv warn_dups ie env avail
    occ_avail = nameOccName (availName avail)
    occ_ie    = ieOcc ie
    key
-    | occ_ie == occ_avail = occ_avail
-    | otherwise           = occ_ie 
+    | not warn_dups || occ_ie == occ_avail = occ_avail
+    | otherwise                            = occ_ie 
         -- export item is a class method, use export occ name instead.
-
+        -- (this is only needed to get more precise warnings about
+	--  duplicates.)
    elt  = (ie,avail,reports_on)
 
    reports_on