projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(1) Caching FD improvements for efficiency, (2) preventing cascading deriveds from...
[ghc-hetmet.git]
/
compiler
/
rename
/
RnHsSyn.lhs
diff --git
a/compiler/rename/RnHsSyn.lhs
b/compiler/rename/RnHsSyn.lhs
index
cb0727b
..
9226cb4
100644
(file)
--- a/
compiler/rename/RnHsSyn.lhs
+++ b/
compiler/rename/RnHsSyn.lhs
@@
-68,9
+68,8
@@
extractHsTyNames ty
get (HsRecTy flds) = extractHsTyNames_s (map cd_fld_type flds)
get (HsNumTy _) = emptyNameSet
get (HsTyVar tv) = unitNameSet tv
get (HsRecTy flds) = extractHsTyNames_s (map cd_fld_type flds)
get (HsNumTy _) = emptyNameSet
get (HsTyVar tv) = unitNameSet tv
- get (HsSpliceTy {}) = emptyNameSet -- Type splices mention no type variables
- get (HsSpliceTyOut {}) = emptyNameSet -- Ditto
- get (HsQuasiQuoteTy {}) = emptyNameSet -- Ditto
+ get (HsSpliceTy _ fvs _) = fvs
+ get (HsQuasiQuoteTy {}) = emptyNameSet
get (HsKindSig ty _) = getl ty
get (HsForAllTy _ tvs
ctxt ty) = (extractHsCtxtTyNames ctxt
get (HsKindSig ty _) = getl ty
get (HsForAllTy _ tvs
ctxt ty) = (extractHsCtxtTyNames ctxt
@@
-78,6
+77,8
@@
extractHsTyNames ty
`minusNameSet`
mkNameSet (hsLTyVarNames tvs)
get (HsDocTy ty _) = getl ty
`minusNameSet`
mkNameSet (hsLTyVarNames tvs)
get (HsDocTy ty _) = getl ty
+ get (HsCoreTy {}) = emptyNameSet -- This probably isn't quite right
+ -- but I don't think it matters
extractHsTyNames_s :: [LHsType Name] -> NameSet
extractHsTyNames_s tys = foldr (unionNameSets . extractHsTyNames) emptyNameSet tys
extractHsTyNames_s :: [LHsType Name] -> NameSet
extractHsTyNames_s tys = foldr (unionNameSets . extractHsTyNames) emptyNameSet tys