X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Frename%2FRnHsSyn.lhs;h=ca4a34a504c289b7091e639a2002b029d1566d91;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=3dd375f31b8564b9604110061f5b550eadd444a0;hpb=9dd6e1c216993624a2cd74b62ca0f0569c02c26b;p=ghc-hetmet.git

diff --git a/ghc/compiler/rename/RnHsSyn.lhs b/ghc/compiler/rename/RnHsSyn.lhs
index 3dd375f..ca4a34a 100644
--- a/ghc/compiler/rename/RnHsSyn.lhs
+++ b/ghc/compiler/rename/RnHsSyn.lhs
@@ -1,5 +1,5 @@
 %
-% (c) The AQUA Project, Glasgow University, 1996
+% (c) The AQUA Project, Glasgow University, 1996-1998
 %
 \section[RnHsSyn]{Specialisations of the @HsSyn@ syntax for the renamer}
 
@@ -8,15 +8,14 @@ module RnHsSyn where
 
 #include "HsVersions.h"
 
+import RnEnv		( listTyCon_name, tupleTyCon_name )
+
 import HsSyn
 import HsPragmas	( InstancePragmas, GenPragmas, DataPragmas, ClassPragmas, ClassOpPragmas )
 
-import Id		( GenId, Id )
-import BasicTypes	( Unused, NewOrData, IfaceFlavour )
+import BasicTypes	( Unused )
 import Name		( Name )
-import Name		( NameSet, unitNameSet, mkNameSet, minusNameSet, unionNameSets, emptyNameSet )
-import TyVar		( GenTyVar )
-import Unique		( Unique )
+import NameSet
 import Util
 import Outputable
 \end{code}
@@ -31,6 +30,7 @@ type RenamedContext		= Context 		Name
 type RenamedHsDecl		= HsDecl		Unused Name RenamedPat
 type RenamedSpecDataSig		= SpecDataSig		Name
 type RenamedDefaultDecl		= DefaultDecl		Name
+type RenamedForeignDecl		= ForeignDecl		Name
 type RenamedFixityDecl		= FixityDecl		Name
 type RenamedGRHS		= GRHS			Unused Name RenamedPat
 type RenamedGRHSsAndBinds	= GRHSsAndBinds		Unused Name RenamedPat
@@ -44,7 +44,6 @@ type RenamedPat			= InPat			Name
 type RenamedHsType		= HsType		Name
 type RenamedRecordBinds		= HsRecordBinds		Unused Name RenamedPat
 type RenamedSig			= Sig			Name
-type RenamedSpecInstSig		= SpecInstSig 		Name
 type RenamedStmt		= Stmt			Unused Name RenamedPat
 type RenamedTyDecl		= TyDecl		Name
 
@@ -69,8 +68,10 @@ extractHsTyNames ty
   = get ty
   where
     get (MonoTyApp ty1 ty2)      = get ty1 `unionNameSets` get ty2
-    get (MonoListTy tc ty)       = unitNameSet tc `unionNameSets` get ty
-    get (MonoTupleTy tc tys)     = unitNameSet tc `unionNameSets` extractHsTyNames_s tys
+    get (MonoListTy ty)          = unitNameSet listTyCon_name 
+				   `unionNameSets` get ty
+    get (MonoTupleTy tys boxed)  = unitNameSet (tupleTyCon_name boxed (length tys)) 
+				   `unionNameSets` extractHsTyNames_s tys
     get (MonoFunTy ty1 ty2)      = get ty1 `unionNameSets` get ty2
     get (MonoDictTy cls tys)     = unitNameSet cls `unionNameSets` extractHsTyNames_s tys
     get (MonoTyVar tv)	         = unitNameSet tv