From b768e242a4934facfd73f24dacd7ef854f85211d Mon Sep 17 00:00:00 2001 From: simonpj Date: Fri, 25 Oct 2002 16:55:00 +0000 Subject: [PATCH] [project @ 2002-10-25 16:54:55 by simonpj] Import wibbles --- ghc/compiler/basicTypes/Name.lhs | 2 +- ghc/compiler/codeGen/CgTailCall.lhs | 3 +-- ghc/compiler/hsSyn/HsBinds.lhs | 1 - ghc/compiler/hsSyn/HsExpr.lhs | 2 +- ghc/compiler/main/DriverState.hs | 4 ++-- ghc/compiler/main/HscMain.lhs | 7 +++---- ghc/compiler/main/Main.hs | 6 +++--- ghc/compiler/rename/RnHiFiles.lhs | 3 +-- ghc/compiler/typecheck/TcDeriv.lhs | 3 +-- ghc/compiler/typecheck/TcExpr.lhs | 3 +-- ghc/compiler/typecheck/TcMatches.lhs | 2 +- 11 files changed, 15 insertions(+), 21 deletions(-) diff --git a/ghc/compiler/basicTypes/Name.lhs b/ghc/compiler/basicTypes/Name.lhs index 07aaad0..fd69b93 100644 --- a/ghc/compiler/basicTypes/Name.lhs +++ b/ghc/compiler/basicTypes/Name.lhs @@ -34,7 +34,7 @@ module Name ( #include "HsVersions.h" import OccName -- All of it -import Module ( Module, ModuleName, moduleName, isHomeModule ) +import Module ( Module, moduleName, isHomeModule ) import CmdLineOpts ( opt_Static ) import SrcLoc ( noSrcLoc, isWiredInLoc, wiredInSrcLoc, SrcLoc ) import Unique ( Unique, Uniquable(..), getKey, pprUnique ) diff --git a/ghc/compiler/codeGen/CgTailCall.lhs b/ghc/compiler/codeGen/CgTailCall.lhs index 6bd49c0..b0a080e 100644 --- a/ghc/compiler/codeGen/CgTailCall.lhs +++ b/ghc/compiler/codeGen/CgTailCall.lhs @@ -1,7 +1,7 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % -% $Id: CgTailCall.lhs,v 1.34 2002/09/11 10:14:32 simonpj Exp $ +% $Id: CgTailCall.lhs,v 1.35 2002/10/25 16:54:56 simonpj Exp $ % %******************************************************** %* * @@ -28,7 +28,6 @@ module CgTailCall ( import CgMonad import AbsCSyn -import PprAbsC ( pprAmode ) import AbsCUtils ( mkAbstractCs, getAmodeRep ) import CgBindery ( getArgAmodes, getCAddrMode, getCAddrModeAndInfo ) diff --git a/ghc/compiler/hsSyn/HsBinds.lhs b/ghc/compiler/hsSyn/HsBinds.lhs index efdb9e4..a3d127d 100644 --- a/ghc/compiler/hsSyn/HsBinds.lhs +++ b/ghc/compiler/hsSyn/HsBinds.lhs @@ -18,7 +18,6 @@ import {-# SOURCE #-} HsExpr ( HsExpr, pprExpr, import HsImpExp ( pprHsVar ) import HsPat ( Pat ) import HsTypes ( HsType ) -import CoreSyn ( CoreExpr ) import PprCore ( {- instance Outputable (Expr a) -} ) --others: diff --git a/ghc/compiler/hsSyn/HsExpr.lhs b/ghc/compiler/hsSyn/HsExpr.lhs index 64eb26d..0cdd2b2 100644 --- a/ghc/compiler/hsSyn/HsExpr.lhs +++ b/ghc/compiler/hsSyn/HsExpr.lhs @@ -19,7 +19,7 @@ import HsImpExp ( isOperator, pprHsVar ) -- others: import ForeignCall ( Safety ) import PprType ( pprParendType ) -import Type ( Type, TyThing ) +import Type ( Type ) import Var ( TyVar, Id ) import Name ( Name ) import DataCon ( DataCon ) diff --git a/ghc/compiler/main/DriverState.hs b/ghc/compiler/main/DriverState.hs index c66fe89..a3defcb 100644 --- a/ghc/compiler/main/DriverState.hs +++ b/ghc/compiler/main/DriverState.hs @@ -1,5 +1,5 @@ ----------------------------------------------------------------------------- --- $Id: DriverState.hs,v 1.84 2002/10/24 14:17:49 simonpj Exp $ +-- $Id: DriverState.hs,v 1.85 2002/10/25 16:54:58 simonpj Exp $ -- -- Settings for the driver -- @@ -26,7 +26,7 @@ import Util import Config import Panic -import DATA_IOREF ( IORef, newIORef, readIORef, writeIORef ) +import DATA_IOREF ( IORef, readIORef, writeIORef ) import EXCEPTION import List diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 1f2cf06..2c4666a 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -58,7 +58,7 @@ import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, emptyModuleEnv ) +import Module ( emptyModuleEnv ) import CmdLineOpts import DriverPhases ( isExtCore_file ) import ErrUtils ( dumpIfSet_dyn, showPass, printError ) @@ -71,9 +71,8 @@ import HscTypes import MkExternalCore ( emitExternalCore ) import ParserCore import ParserCoreUtils -import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) -import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName ) +import FiniteMap ( emptyFM ) +import Name ( Name, nameModule, getName ) import NameEnv ( emptyNameEnv, mkNameEnv ) import NameSet ( emptyNameSet ) import Module ( Module, ModLocation(..), showModMsg ) diff --git a/ghc/compiler/main/Main.hs b/ghc/compiler/main/Main.hs index a4f8255..298107c 100644 --- a/ghc/compiler/main/Main.hs +++ b/ghc/compiler/main/Main.hs @@ -1,7 +1,7 @@ {-# OPTIONS -fno-warn-incomplete-patterns -optc-DNON_POSIX_SOURCE #-} ----------------------------------------------------------------------------- --- $Id: Main.hs,v 1.113 2002/10/24 13:08:35 simonmar Exp $ +-- $Id: Main.hs,v 1.114 2002/10/25 16:54:59 simonpj Exp $ -- -- GHC Driver program -- @@ -19,6 +19,7 @@ module Main (main) where #ifdef GHCI import InteractiveUI +import DriverPhases( objish_file ) #endif @@ -42,8 +43,7 @@ import DriverFlags ( buildStaticHscOpts, dynamic_flags, processArgs, static_flags) import DriverMkDepend ( beginMkDependHS, endMkDependHS ) -import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, objish_file, - isSourceFile ) +import DriverPhases ( Phase(HsPp, Hsc), haskellish_src_file, isSourceFile ) import DriverUtil ( add, handle, handleDyn, later, splitFilename, unknownFlagsErr, getFileSuffix ) diff --git a/ghc/compiler/rename/RnHiFiles.lhs b/ghc/compiler/rename/RnHiFiles.lhs index 39226b7..a6a9279 100644 --- a/ghc/compiler/rename/RnHiFiles.lhs +++ b/ghc/compiler/rename/RnHiFiles.lhs @@ -14,7 +14,7 @@ module RnHiFiles ( #include "HsVersions.h" import DriverState ( v_GhcMode, isCompManagerMode ) -import DriverUtil ( splitFilename, replaceFilenameSuffix ) +import DriverUtil ( replaceFilenameSuffix ) import CmdLineOpts ( opt_IgnoreIfacePragmas ) import Parser ( parseIface ) import HscTypes ( ModIface(..), emptyModIface, @@ -69,7 +69,6 @@ import Outputable import Bag import BinIface ( readBinIface ) import Panic -import Config import EXCEPTION as Exception import DATA_IOREF ( readIORef ) diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index 99f3544..2e5dc6b 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -48,7 +48,7 @@ import TyCon ( tyConTyVars, tyConDataCons, tyConArity, newTyConRep, ) import TcType ( TcType, ThetaType, mkTyVarTys, mkTyConApp, getClassPredTys_maybe, isUnLiftedType, mkClassPred, tyVarsOfTypes, tcSplitFunTys, - tcSplitTyConApp_maybe, tcEqTypes, mkAppTys ) + tcEqTypes, mkAppTys ) import Type ( splitAppTys ) import Var ( TyVar, tyVarKind ) import VarSet ( mkVarSet, subVarSet ) @@ -56,7 +56,6 @@ import PrelNames import Util ( zipWithEqual, sortLt, notNull ) import ListSetOps ( removeDups, assoc ) import Outputable -import Maybe ( isJust ) \end{code} %************************************************************************ diff --git a/ghc/compiler/typecheck/TcExpr.lhs b/ghc/compiler/typecheck/TcExpr.lhs index 676a5d2..e9afbf5 100644 --- a/ghc/compiler/typecheck/TcExpr.lhs +++ b/ghc/compiler/typecheck/TcExpr.lhs @@ -26,7 +26,7 @@ import TcRnMonad import TcUnify ( tcSubExp, tcGen, (<$>), unifyTauTy, unifyFunTy, unifyListTy, unifyPArrTy, unifyTupleTy ) -import BasicTypes ( RecFlag(..), isMarkedStrict ) +import BasicTypes ( isMarkedStrict ) import Inst ( InstOrigin(..), newOverloadedLit, newMethodFromName, newIPDict, newDicts, newMethodWithGivenTy, @@ -39,7 +39,6 @@ import TcEnv ( tcLookupClass, tcLookupGlobal_maybe, tcLookupIdLvl, import TcMatches ( tcMatchesCase, tcMatchLambda, tcDoStmts ) import TcMonoType ( tcHsSigType, UserTypeCtxt(..) ) import TcPat ( badFieldCon ) -import TcSimplify ( tcSimplifyIPs ) import TcMType ( tcInstTyVars, tcInstType, newHoleTyVarTy, zapToType, newTyVarTy, newTyVarTys, zonkTcType, readHoleResult ) import TcType ( TcType, TcSigmaType, TcRhoType, TyVarDetails(VanillaTv), diff --git a/ghc/compiler/typecheck/TcMatches.lhs b/ghc/compiler/typecheck/TcMatches.lhs index 317e335..f1048d8 100644 --- a/ghc/compiler/typecheck/TcMatches.lhs +++ b/ghc/compiler/typecheck/TcMatches.lhs @@ -16,7 +16,7 @@ import HsSyn ( HsExpr(..), HsBinds(..), Match(..), GRHSs(..), GRHS(..), MonoBinds(..), Stmt(..), HsMatchContext(..), HsStmtContext(..), pprMatch, getMatchLoc, isDoExpr, pprMatchContext, pprStmtContext, pprStmtResultContext, - mkMonoBind, nullMonoBinds, collectSigTysFromPats, andMonoBindList + mkMonoBind, collectSigTysFromPats, andMonoBindList ) import RnHsSyn ( RenamedMatch, RenamedGRHSs, RenamedStmt, RenamedPat, RenamedMatchContext ) -- 1.7.10.4