projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-11-24 09:51:38 by simonpj]
[ghc-hetmet.git]
/
ghc
/
compiler
/
typecheck
/
TcImprove.lhs
diff --git
a/ghc/compiler/typecheck/TcImprove.lhs
b/ghc/compiler/typecheck/TcImprove.lhs
index
76e3064
..
6c7c51c
100644
(file)
--- a/
ghc/compiler/typecheck/TcImprove.lhs
+++ b/
ghc/compiler/typecheck/TcImprove.lhs
@@
-7,7
+7,8
@@
import Name ( Name )
import Class ( Class, FunDep, className )
import Unify ( unifyTyListsX )
import Subst ( mkSubst, emptyInScopeSet, substTy )
import Class ( Class, FunDep, className )
import Unify ( unifyTyListsX )
import Subst ( mkSubst, emptyInScopeSet, substTy )
-import TcEnv ( tcGetInstEnv, classInstEnv )
+import TcEnv ( tcGetInstEnv )
+import InstEnv ( classInstEnv )
import TcMonad
import TcType ( TcType, TcTyVarSet, zonkTcType )
import TcUnify ( unifyTauTyLists )
import TcMonad
import TcType ( TcType, TcTyVarSet, zonkTcType )
import TcUnify ( unifyTauTyLists )
@@
-18,7
+19,7
@@
import List ( nub )
\end{code}
\begin{code}
\end{code}
\begin{code}
-tcImprove :: LIE -> TcM s ()
+tcImprove :: LIE -> TcM ()
-- Do unifications based on functional dependencies in the LIE
tcImprove lie
= tcGetInstEnv `thenNF_Tc` \ inst_env ->
-- Do unifications based on functional dependencies in the LIE
tcImprove lie
= tcGetInstEnv `thenNF_Tc` \ inst_env ->
@@
-57,7
+58,7
@@
tcImprove lie
iterImprove nfdss
iterImprove nfdss
-iterImprove :: [(VarSet, Name, [FunDep TcType])] -> TcM s ()
+iterImprove :: [(VarSet, Name, [FunDep TcType])] -> TcM ()
iterImprove [] = returnTc ()
iterImprove cfdss
= selfImprove pairImprove cfdss `thenTc` \ change2 ->
iterImprove [] = returnTc ()
iterImprove cfdss
= selfImprove pairImprove cfdss `thenTc` \ change2 ->