projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 1998-12-02 13:17:09 by simonm]
[ghc-hetmet.git]
/
ghc
/
compiler
/
rename
/
RnHsSyn.lhs
diff --git
a/ghc/compiler/rename/RnHsSyn.lhs
b/ghc/compiler/rename/RnHsSyn.lhs
index
3dd375f
..
ca4a34a
100644
(file)
--- 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}
%
\section[RnHsSyn]{Specialisations of the @HsSyn@ syntax for the renamer}
@@
-8,15
+8,14
@@
module RnHsSyn where
#include "HsVersions.h"
#include "HsVersions.h"
+import RnEnv ( listTyCon_name, tupleTyCon_name )
+
import HsSyn
import HsPragmas ( InstancePragmas, GenPragmas, DataPragmas, ClassPragmas, ClassOpPragmas )
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 ( Name )
-import Name ( NameSet, unitNameSet, mkNameSet, minusNameSet, unionNameSets, emptyNameSet )
-import TyVar ( GenTyVar )
-import Unique ( Unique )
+import NameSet
import Util
import Outputable
\end{code}
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 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
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 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
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 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
get (MonoFunTy ty1 ty2) = get ty1 `unionNameSets` get ty2
get (MonoDictTy cls tys) = unitNameSet cls `unionNameSets` extractHsTyNames_s tys
get (MonoTyVar tv) = unitNameSet tv