From 7e21843581a45a6f99875c353e5d47fd8a58ff13 Mon Sep 17 00:00:00 2001 From: sof Date: Fri, 14 Aug 1998 11:19:22 +0000 Subject: [PATCH] [project @ 1998-08-14 11:19:17 by sof] More import list updates --- ghc/compiler/simplStg/SimplStg.lhs | 10 +--------- ghc/compiler/stgSyn/CoreToStg.lhs | 24 +++++++----------------- ghc/compiler/stgSyn/StgLint.lhs | 3 +-- 3 files changed, 9 insertions(+), 28 deletions(-) diff --git a/ghc/compiler/simplStg/SimplStg.lhs b/ghc/compiler/simplStg/SimplStg.lhs index fb626f3..d84539b 100644 --- a/ghc/compiler/simplStg/SimplStg.lhs +++ b/ghc/compiler/simplStg/SimplStg.lhs @@ -11,8 +11,6 @@ module SimplStg ( stg2stg ) where import StgSyn import LambdaLift ( liftProgram ) -import Name ( isLocallyDefined ) -import UniqSet ( UniqSet, mapUniqSet ) import CostCentre ( CostCentre ) import SCCfinal ( stgMassageForProfiling ) import StgLint ( lintStgBindings ) @@ -25,17 +23,11 @@ import CmdLineOpts ( opt_SccGroup, --Not used:opt_EnsureSplittableC, opt_DoStgLinting, StgToDo(..) ) -import Id ( nullIdEnv, lookupIdEnv, addOneToIdEnv, - growIdEnvList, isNullIdEnv, IdEnv, - GenId{-instance Eq/Outputable -}, Id - ) -import Maybes ( maybeToBool ) import ErrUtils ( doIfSet ) import UniqSupply ( splitUniqSupply, UniqSupply ) -import Util ( mapAccumL, panic, assertPanic ) +import Util ( panic, assertPanic, trace ) import IO ( hPutStr, stderr ) import Outputable -import GlaExts ( trace ) \end{code} \begin{code} diff --git a/ghc/compiler/stgSyn/CoreToStg.lhs b/ghc/compiler/stgSyn/CoreToStg.lhs index d899067..77d01ff 100644 --- a/ghc/compiler/stgSyn/CoreToStg.lhs +++ b/ghc/compiler/stgSyn/CoreToStg.lhs @@ -17,30 +17,20 @@ module CoreToStg ( topCoreBindsToStg ) where import CoreSyn -- input import StgSyn -- output -import Bag ( emptyBag, unitBag, unionBags, unionManyBags, bagToList ) import CoreUtils ( coreExprType ) import CostCentre ( noCostCentre ) import MkId ( mkSysLocal ) -import Id ( idType, isBottomingId, - externallyVisibleId, mkIdWithNewUniq, - nullIdEnv, addOneToIdEnv, lookupIdEnv, growIdEnvList, +import Id ( externallyVisibleId, mkIdWithNewUniq, + nullIdEnv, addOneToIdEnv, lookupIdEnv, IdEnv, Id ) -import Literal ( mkMachInt, Literal(..) ) -import PrelVals ( unpackCStringId, unpackCString2Id, - integerZeroId, integerPlusOneId, - integerPlusTwoId, integerMinusOneId - ) -import PrimOp ( PrimOp(..) ) import SrcLoc ( noSrcLoc ) -import TyCon ( TyCon{-instance Uniquable-} ) import Type ( splitAlgTyConApp, Type ) -import TysWiredIn ( stringTy ) -import Unique ( integerTyConKey, ratioTyConKey, Unique{-instance Eq-} ) -import UniqSupply -- all of it, really -import Util ( zipLazy ) -import Outputable -import Ratio ( numerator, denominator ) +import UniqSupply ( UniqSupply, UniqSM, + returnUs, thenUs, initUs, + mapUs, getUnique + ) +import Outputable ( panic ) isLeakFreeType x y = False -- safe option; ToDo \end{code} diff --git a/ghc/compiler/stgSyn/StgLint.lhs b/ghc/compiler/stgSyn/StgLint.lhs index 6a06265..3603389 100644 --- a/ghc/compiler/stgSyn/StgLint.lhs +++ b/ghc/compiler/stgSyn/StgLint.lhs @@ -27,8 +27,7 @@ import Type ( mkFunTys, splitFunTys, splitAlgTyConApp_maybe, isTyVarTy, Type ) import TyCon ( TyCon, isDataTyCon ) -import Util ( zipEqual ) -import GlaExts ( trace ) +import Util ( zipEqual, trace ) import Outputable infixr 9 `thenL`, `thenL_`, `thenMaybeL`, `thenMaybeL_` -- 1.7.10.4