[project @ 1997-07-26 03:37:54 by sof]

imports changed

diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/ghc/compiler/typecheck/TcSimplify.lhs
index 27e54e6..14a82ab 100644 (file)
--- a/ghc/compiler/typecheck/TcSimplify.lhs
+++ b/ghc/compiler/typecheck/TcSimplify.lhs
@@ -18,8 +18,7 @@ import HsSyn          ( MonoBinds(..), HsExpr(..), InPat, OutPat, HsLit,
                          Match, HsBinds, HsType, ArithSeqInfo, Fixity,
                          GRHSsAndBinds, Stmt, DoOrListComp, Fake )
 import HsBinds         ( andMonoBinds )
-import TcHsSyn         ( TcIdOcc(..), SYN_IE(TcIdBndr), SYN_IE(TcExpr), 
-                         SYN_IE(TcMonoBinds), SYN_IE(TcDictBinds) )
+import TcHsSyn         ( SYN_IE(TcExpr), SYN_IE(TcMonoBinds), SYN_IE(TcDictBinds) )
 
 import TcMonad
 import Inst            ( lookupInst, lookupSimpleInst,
@@ -32,7 +31,9 @@ import Inst           ( lookupInst, lookupSimpleInst,
                          OverloadedLit )
 import TcEnv           ( tcGetGlobalTyVars )
 import SpecEnv         ( SpecEnv )
-import TcType          ( SYN_IE(TcType), SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), TcMaybe, tcInstType )
+import TcType          ( TcIdOcc(..), SYN_IE(TcIdBndr), 
+                         SYN_IE(TcType), SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), TcMaybe, tcInstType
+                       )
 import Unify           ( unifyTauTy )
 
 import Bag             ( Bag, unitBag, listToBag, foldBag, filterBag, emptyBag, bagToList, 

diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs
index 225b4de..7a585ad 100644 (file)
--- a/ghc/compiler/typecheck/TcTyClsDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs
@@ -19,7 +19,7 @@ import HsSyn          ( HsDecl(..), TyDecl(..),  ConDecl(..), ConDetails(..), BangType(.
                        )
 import RnHsSyn         ( RenamedTyDecl(..), RenamedClassDecl(..), SYN_IE(RenamedHsDecl)
                        )
-import TcHsSyn         ( SYN_IE(TcHsBinds), TcIdOcc(..) )
+import TcHsSyn         ( SYN_IE(TcHsBinds) )
 
 import TcMonad
 import Inst            ( SYN_IE(InstanceMapper) )
@@ -29,6 +29,7 @@ import SpecEnv                ( SpecEnv )
 import TcKind          ( TcKind, newKindVars )
 import TcTyDecls       ( tcTyDecl, mkDataBinds )
 import TcMonoType      ( tcTyVarScope )
+import TcType          ( TcIdOcc(..) )
 
 import Bag     
 import Class           ( SYN_IE(Class) )

diff --git a/ghc/compiler/typecheck/TcTyDecls.lhs b/ghc/compiler/typecheck/TcTyDecls.lhs
index 83e0f7a..84ad5fa 100644 (file)
--- a/ghc/compiler/typecheck/TcTyDecls.lhs
+++ b/ghc/compiler/typecheck/TcTyDecls.lhs
@@ -24,12 +24,12 @@ import HsSyn                ( TyDecl(..), ConDecl(..), ConDetails(..), BangType(..), HsExpr(..
 import HsTypes         ( getTyVarName )
 import RnHsSyn         ( RenamedTyDecl(..), RenamedConDecl(..) )
 import TcHsSyn         ( mkHsTyLam, mkHsDictLam, tcIdType,
-                         SYN_IE(TcHsBinds), TcIdOcc(..), SYN_IE(TcMonoBinds)
+                         SYN_IE(TcHsBinds), SYN_IE(TcMonoBinds)
                        )
 import Inst            ( newDicts, InstOrigin(..), Inst )
 import TcMonoType      ( tcHsTypeKind, tcHsType, tcContext )
 import TcSimplify      ( tcSimplifyThetas )
-import TcType          ( tcInstTyVars, tcInstType, tcInstId )
+import TcType          ( TcIdOcc(..), tcInstTyVars, tcInstType, tcInstId )
 import TcEnv           ( tcLookupTyCon, tcLookupTyVar, tcLookupClass,
                          newLocalId, newLocalIds, tcLookupClassByKey
                        )