From: simonm <unknown>
Date: Thu, 4 Dec 1997 11:02:12 +0000 (+0000)
Subject: [project @ 1997-12-04 11:02:12 by simonm]
X-Git-Tag: Approx_2487_patches~1201
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=e12e19567024ade8643918a88cc22a74d879afdb;hp=85bd53c951e5504005b9bf9dc3dd884099942f37;p=ghc-hetmet.git

[project @ 1997-12-04 11:02:12 by simonm]
fix huge bug in extractHsTyVars - the list returned wasn't always a
set (i.e. it could have duplicates).  This screwed up support for
universal quantification in a couple of places.
---

diff --git a/ghc/compiler/reader/RdrHsSyn.lhs b/ghc/compiler/reader/RdrHsSyn.lhs
index 0539152..22827fa 100644
--- a/ghc/compiler/reader/RdrHsSyn.lhs
+++ b/ghc/compiler/reader/RdrHsSyn.lhs
@@ -127,16 +127,16 @@ extractHsTyVars ty
 
 	-- In (All a => a -> a) -> Int, there are no free tyvars
 	-- We just assume that we quantify over all type variables mentioned in the context.
-    get (HsPreForAllTy ctxt ty)  acc = filter (`notElem` locals) (get ty [])
-				       ++ acc
-				     where
-				       locals = foldr (get . snd) [] ctxt
+    get (HsPreForAllTy ctxt ty)  acc = 
+		foldr insert acc (filter (`notElem` locals) (get ty []))
+	    where
+		locals = foldr (get . snd) [] ctxt
 
-    get (HsForAllTy tvs ctxt ty) acc = (filter (`notElem` locals) $
+    get (HsForAllTy tvs ctxt ty) acc = 
+		foldr insert acc (filter (`notElem` locals) $
 				        foldr (get . snd) (get ty []) ctxt)
-				       ++ acc
-				     where
-				       locals = map getTyVarName tvs
+	     where
+	       	locals = map getTyVarName tvs
 
     insert (Qual _ _ _)	      acc = acc
     insert (Unqual (TCOcc _)) acc = acc