From 63d3d2028eebf43770212f55242c938c59d9ba13 Mon Sep 17 00:00:00 2001 From: sof <unknown> Date: Sat, 26 Jul 1997 03:18:17 +0000 Subject: [PATCH] [project @ 1997-07-26 03:14:06 by sof] imports changed --- ghc/compiler/typecheck/TcClassDcl.lhs | 4 ++-- ghc/compiler/typecheck/TcDefaults.lhs | 2 +- ghc/compiler/typecheck/TcDeriv.lhs | 2 +- ghc/compiler/typecheck/TcEnv.lhs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ghc/compiler/typecheck/TcClassDcl.lhs b/ghc/compiler/typecheck/TcClassDcl.lhs index 5e555ff099ce..66b4d5619e66 100644 --- a/ghc/compiler/typecheck/TcClassDcl.lhs +++ b/ghc/compiler/typecheck/TcClassDcl.lhs @@ -22,7 +22,7 @@ import RnHsSyn ( RenamedClassDecl(..), RenamedClassPragmas(..), RenamedClassOpSig(..), SYN_IE(RenamedMonoBinds), RenamedGenPragmas(..), RenamedContext(..), SYN_IE(RenamedHsDecl) ) -import TcHsSyn ( TcIdOcc(..), SYN_IE(TcHsBinds), SYN_IE(TcMonoBinds), SYN_IE(TcExpr), +import TcHsSyn ( SYN_IE(TcHsBinds), SYN_IE(TcMonoBinds), SYN_IE(TcExpr), mkHsTyApp, mkHsTyLam, mkHsDictApp, mkHsDictLam, tcIdType ) import Inst ( Inst, InstOrigin(..), SYN_IE(LIE), emptyLIE, plusLIE, newDicts, newMethod ) @@ -33,7 +33,7 @@ import TcKind ( unifyKind, TcKind ) import TcMonad import TcMonoType ( tcHsType, tcContext ) import TcSimplify ( tcSimplifyAndCheck ) -import TcType ( SYN_IE(TcType), SYN_IE(TcTyVar), tcInstType, tcInstSigTyVars, +import TcType ( TcIdOcc(..), SYN_IE(TcType), SYN_IE(TcTyVar), tcInstType, tcInstSigTyVars, tcInstSigType, tcInstSigTcType ) import PragmaInfo ( PragmaInfo(..) ) diff --git a/ghc/compiler/typecheck/TcDefaults.lhs b/ghc/compiler/typecheck/TcDefaults.lhs index 0b9a66b67bf6..49f9421afa12 100644 --- a/ghc/compiler/typecheck/TcDefaults.lhs +++ b/ghc/compiler/typecheck/TcDefaults.lhs @@ -14,7 +14,6 @@ import HsSyn ( HsDecl(..), TyDecl, ClassDecl, InstDecl, HsBinds, DefaultDecl(..), HsType, IfaceSig, HsExpr, HsLit, ArithSeqInfo, Fake, InPat) import RnHsSyn ( RenamedHsDecl(..), RenamedDefaultDecl(..) ) -import TcHsSyn ( TcIdOcc ) import TcMonad import Inst ( InstOrigin(..) ) @@ -22,6 +21,7 @@ import TcEnv ( tcLookupClassByKey ) import SpecEnv ( SpecEnv ) import TcMonoType ( tcHsType ) import TcSimplify ( tcSimplifyCheckThetas ) +import TcType ( TcIdOcc ) import TysWiredIn ( intTy, doubleTy, unitTy ) import Type ( SYN_IE(Type) ) diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index 5a089e1c7d3c..58e25a9efcc4 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -21,7 +21,6 @@ import HsSyn ( HsDecl, FixityDecl, Fixity, InstDecl, import HsPragmas ( InstancePragmas(..) ) import RdrHsSyn ( RdrName, SYN_IE(RdrNameMonoBinds) ) import RnHsSyn ( SYN_IE(RenamedHsBinds), SYN_IE(RenamedMonoBinds), SYN_IE(RenamedFixityDecl) ) -import TcHsSyn ( TcIdOcc ) import TcMonad import Inst ( SYN_IE(InstanceMapper) ) @@ -31,6 +30,7 @@ import TcKind ( TcKind ) import TcGenDeriv -- Deriv stuff import TcInstUtil ( InstInfo(..), mkInstanceRelatedIds, buildInstanceEnvs ) import TcSimplify ( tcSimplifyThetas ) +import TcType ( TcIdOcc ) import RnBinds ( rnMethodBinds, rnTopMonoBinds ) import RnEnv ( newDfunName, bindLocatedLocalsRn ) diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs index 946eb8b8fb75..2fb27cbd20b2 100644 --- a/ghc/compiler/typecheck/TcEnv.lhs +++ b/ghc/compiler/typecheck/TcEnv.lhs @@ -31,9 +31,9 @@ IMPORT_DELOOPER(TcMLoop) -- for paranoia checking import HsTypes ( HsTyVar(..) ) import Id ( SYN_IE(Id), GenId, idType, mkUserLocal, mkUserId, replaceIdInfo, getIdInfo ) import PragmaInfo ( PragmaInfo(..) ) -import TcHsSyn ( SYN_IE(TcIdBndr), TcIdOcc(..) ) import TcKind ( TcKind, newKindVars, newKindVar, tcDefaultKind, kindToTcKind, Kind ) -import TcType ( SYN_IE(TcType), TcMaybe, SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), +import TcType ( SYN_IE(TcIdBndr), TcIdOcc(..), + SYN_IE(TcType), TcMaybe, SYN_IE(TcTyVar), SYN_IE(TcTyVarSet), newTyVarTys, tcInstTyVars, zonkTcTyVars ) import TyVar ( unionTyVarSets, emptyTyVarSet, tyVarSetToList, SYN_IE(TyVar) ) -- GitLab