X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnHsSyn.lhs;h=3ad4a0561745a375df9f91c3bd69f629aa223d4b;hb=5a763550bf31ce446812d89f4967b601f122d344;hp=efe24a3645cf85e4575a6b99b39bf94f876be572;hpb=fd8400f7a7bcdde8fb6544b327561f00b4f0ade5;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnHsSyn.lhs b/ghc/compiler/rename/RnHsSyn.lhs
index efe24a3..3ad4a05 100644
--- a/ghc/compiler/rename/RnHsSyn.lhs
+++ b/ghc/compiler/rename/RnHsSyn.lhs
@@ -10,7 +10,7 @@ module RnHsSyn where
 
 import HsSyn
 import HsCore
-import Class		( FunDep, DefMeth(..) )
+import Class		( FunDep )
 import TysWiredIn	( tupleTyCon, listTyCon, charTyCon )
 import Name		( Name, getName, isTyVarName )
 import NameSet
@@ -77,8 +77,7 @@ extractHsTyNames ty
   where
     get (HsAppTy ty1 ty2)      = get ty1 `unionNameSets` get ty2
     get (HsListTy ty)          = unitNameSet listTyCon_name `unionNameSets` get ty
-    get (HsTupleTy (HsTupCon n _) tys) = unitNameSet n
-				   	 `unionNameSets` extractHsTyNames_s tys
+    get (HsTupleTy con tys)    = hsTupConFVs con `unionNameSets` extractHsTyNames_s tys
     get (HsFunTy ty1 ty2)      = get ty1 `unionNameSets` get ty2
     get (HsPredTy p)	       = extractHsPredTyNames p
     get (HsOpTy ty1 tycon ty2) = get ty1 `unionNameSets` get ty2 `unionNameSets`
@@ -114,7 +113,7 @@ extractHsPredTyNames (HsPIParam n ty)
 
 Return the Names that must be in scope if we are to use this declaration.
 In all cases this is set up for interface-file declarations:
-	- for class decls we ignroe the bindings
+	- for class decls we ignore the bindings
 	- for instance decls likewise, plus the pragmas
 	- for rule decls, we ignore HsRules
 
@@ -145,6 +144,7 @@ hsSigsFVs sigs = plusFVs (map hsSigFVs sigs)
 hsSigFVs (Sig v ty _) 	    = extractHsTyNames ty
 hsSigFVs (SpecInstSig ty _) = extractHsTyNames ty
 hsSigFVs (SpecSig v ty _)   = extractHsTyNames ty
+hsSigFVs (ClassOpSig _ _ ty _) = extractHsTyNames ty
 hsSigFVs other		    = emptyFVs
 
 ----------------
@@ -204,7 +204,7 @@ ufConFVs other		    = emptyFVs
 ufNoteFVs (UfCoerce ty) = extractHsTyNames ty
 ufNoteFVs note		= emptyFVs
 
-hsTupConFVs (HsTupCon n _) = unitFV n
+hsTupConFVs (HsTupCon n _ _) = unitFV n
 \end{code}
 
 %************************************************************************