From 05446f0f1e826cd95c8bbcc355015a02ec8595ca Mon Sep 17 00:00:00 2001 From: sewardj Date: Mon, 23 Oct 2000 12:00:22 +0000 Subject: [PATCH] [project @ 2000-10-23 12:00:21 by sewardj] Track renaming of typecheck/TcInstUtil to types/InstEnv. --- ghc/compiler/main/MkIface.lhs | 2 +- ghc/compiler/typecheck/Inst.lhs | 2 +- ghc/compiler/typecheck/TcDeriv.lhs | 2 +- ghc/compiler/typecheck/TcEnv.lhs | 2 +- ghc/compiler/typecheck/TcImprove.lhs | 2 +- ghc/compiler/typecheck/TcInstDcls.lhs | 2 +- ghc/compiler/typecheck/TcModule.lhs | 2 +- ghc/compiler/typecheck/TcSimplify.lhs | 2 +- ghc/compiler/types/InstEnv.lhs | 4 ++-- 9 files changed, 10 insertions(+), 10 deletions(-) diff --git a/ghc/compiler/main/MkIface.lhs b/ghc/compiler/main/MkIface.lhs index 1d709ef..5ab757f 100644 --- a/ghc/compiler/main/MkIface.lhs +++ b/ghc/compiler/main/MkIface.lhs @@ -20,7 +20,7 @@ import BasicTypes ( Fixity(..), NewOrData(..), ) import RnMonad -import TcInstUtil ( InstInfo(..) ) +import InstEnv ( InstInfo(..) ) import CmdLineOpts import Id ( Id, idType, idInfo, omitIfaceSigForId, isUserExportedId, hasNoBinding, diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index 307d49e..8d6c869 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -44,7 +44,7 @@ import TcHsSyn ( TcExpr, TcId, ) import TcMonad import TcEnv ( TcIdSet, tcGetInstEnv, tcLookupGlobalId ) -import TcInstUtil ( InstLookupResult(..), lookupInstEnv ) +import InstEnv ( InstLookupResult(..), lookupInstEnv ) import TcType ( TcThetaType, TcType, TcTauType, TcTyVarSet, zonkTcTyVars, zonkTcType, zonkTcTypes, diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index 492d227..28a2e24 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -18,7 +18,7 @@ import CmdLineOpts ( DynFlag(..), DynFlags ) import TcMonad import TcEnv ( TcEnv, tcSetInstEnv, getTcGST, newDFunName ) import TcGenDeriv -- Deriv stuff -import TcInstUtil ( InstInfo(..), InstEnv, +import InstEnv ( InstInfo(..), InstEnv, pprInstInfo, simpleDFunClassTyCon, extendInstEnv ) import TcSimplify ( tcSimplifyThetas ) diff --git a/ghc/compiler/typecheck/TcEnv.lhs b/ghc/compiler/typecheck/TcEnv.lhs index 27b0a8b..b244765 100644 --- a/ghc/compiler/typecheck/TcEnv.lhs +++ b/ghc/compiler/typecheck/TcEnv.lhs @@ -69,7 +69,7 @@ import UniqFM import Util ( zipEqual ) import SrcLoc ( SrcLoc ) import Outputable -import TcInstUtil ( emptyInstEnv ) +import InstEnv ( emptyInstEnv ) import IOExts ( newIORef ) \end{code} diff --git a/ghc/compiler/typecheck/TcImprove.lhs b/ghc/compiler/typecheck/TcImprove.lhs index 8a66a7d..6c7c51c 100644 --- a/ghc/compiler/typecheck/TcImprove.lhs +++ b/ghc/compiler/typecheck/TcImprove.lhs @@ -8,7 +8,7 @@ import Class ( Class, FunDep, className ) import Unify ( unifyTyListsX ) import Subst ( mkSubst, emptyInScopeSet, substTy ) import TcEnv ( tcGetInstEnv ) -import TcInstUtil ( classInstEnv ) +import InstEnv ( classInstEnv ) import TcMonad import TcType ( TcType, TcTyVarSet, zonkTcType ) import TcUnify ( unifyTauTyLists ) diff --git a/ghc/compiler/typecheck/TcInstDcls.lhs b/ghc/compiler/typecheck/TcInstDcls.lhs index 987d1d5..a94d11f 100644 --- a/ghc/compiler/typecheck/TcInstDcls.lhs +++ b/ghc/compiler/typecheck/TcInstDcls.lhs @@ -33,7 +33,7 @@ import TcEnv ( TcEnv, tcExtendGlobalValEnv, tcAddImportedIdInfo, tcInstId, tcLookupClass, newDFunName, tcExtendTyVarEnv ) -import TcInstUtil ( InstInfo(..), InstEnv, pprInstInfo, classDataCon, +import InstEnv ( InstInfo(..), InstEnv, pprInstInfo, classDataCon, simpleInstInfoTyCon, simpleInstInfoTy, isLocalInst, extendInstEnv ) import TcMonoType ( tcTyVars, tcHsSigType, tcHsType, kcHsSigType ) diff --git a/ghc/compiler/typecheck/TcModule.lhs b/ghc/compiler/typecheck/TcModule.lhs index 850dc53..608511b 100644 --- a/ghc/compiler/typecheck/TcModule.lhs +++ b/ghc/compiler/typecheck/TcModule.lhs @@ -33,7 +33,7 @@ import TcRules ( tcRules ) import TcForeign ( tcForeignImports, tcForeignExports ) import TcIfaceSig ( tcInterfaceSigs ) import TcInstDcls ( tcInstDecls1, tcInstDecls2 ) -import TcInstUtil ( InstInfo(..) ) +import InstEnv ( InstInfo(..) ) import TcSimplify ( tcSimplifyTop ) import TcTyClsDecls ( tcTyAndClassDecls ) import TcTyDecls ( mkImplicitDataBinds ) diff --git a/ghc/compiler/typecheck/TcSimplify.lhs b/ghc/compiler/typecheck/TcSimplify.lhs index 45cc94c..5d430e6 100644 --- a/ghc/compiler/typecheck/TcSimplify.lhs +++ b/ghc/compiler/typecheck/TcSimplify.lhs @@ -143,7 +143,7 @@ import Inst ( lookupInst, lookupSimpleInst, LookupInstResult(..), lieToList ) import TcEnv ( tcGetGlobalTyVars, tcGetInstEnv ) -import TcInstUtil ( lookupInstEnv, InstLookupResult(..) ) +import InstEnv ( lookupInstEnv, InstLookupResult(..) ) import TcType ( TcTyVarSet ) import TcUnify ( unifyTauTy ) diff --git a/ghc/compiler/types/InstEnv.lhs b/ghc/compiler/types/InstEnv.lhs index 083ea79..d054178 100644 --- a/ghc/compiler/types/InstEnv.lhs +++ b/ghc/compiler/types/InstEnv.lhs @@ -1,12 +1,12 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -\section[TcInstUtil]{Utilities for typechecking instance declarations} +\section[InstEnv]{Utilities for typechecking instance declarations} The bits common to TcInstDcls and TcDeriv. \begin{code} -module TcInstUtil ( +module InstEnv ( InstInfo(..), pprInstInfo, simpleInstInfoTy, simpleInstInfoTyCon, simpleDFunClassTyCon, -- 1.7.10.4