projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adjust code from manual merges
[ghc-hetmet.git]
/
compiler
/
types
/
TyCon.lhs
diff --git
a/compiler/types/TyCon.lhs
b/compiler/types/TyCon.lhs
index
31cb19b
..
b359660
100644
(file)
--- a/
compiler/types/TyCon.lhs
+++ b/
compiler/types/TyCon.lhs
@@
-101,6
+101,8
@@
data TyCon
tyConTyVars :: [TyVar], -- Scopes over (a) the algTcStupidTheta
-- (b) the cached types in
-- algTyConRhs.NewTyCon
tyConTyVars :: [TyVar], -- Scopes over (a) the algTcStupidTheta
-- (b) the cached types in
-- algTyConRhs.NewTyCon
+ -- (c) the family instance
+ -- types if present
-- But not over the data constructors
tyConArgPoss :: Maybe [Int], -- for associated families: for each
-- But not over the data constructors
tyConArgPoss :: Maybe [Int], -- for associated families: for each