From af93bb787305c0401eb658f149021e22d1ab98cc Mon Sep 17 00:00:00 2001 From: simonpj Date: Wed, 13 Feb 2002 14:06:00 +0000 Subject: [PATCH] [project @ 2002-02-13 14:05:50 by simonpj] Import wibbles --- ghc/compiler/deSugar/DsExpr.lhs | 4 ++-- ghc/compiler/deSugar/DsListComp.lhs | 1 - ghc/compiler/main/HscMain.lhs | 4 ++-- ghc/compiler/nativeGen/StixInfo.lhs | 1 - ghc/compiler/parser/Parser.y | 6 +++--- ghc/compiler/prelude/PrimOp.lhs | 5 +---- ghc/compiler/typecheck/TcDeriv.lhs | 4 ++-- ghc/compiler/typecheck/TcForeign.lhs | 1 - ghc/compiler/typecheck/TcTyClsDecls.lhs | 2 +- ghc/compiler/types/PprType.lhs | 1 - 10 files changed, 11 insertions(+), 18 deletions(-) diff --git a/ghc/compiler/deSugar/DsExpr.lhs b/ghc/compiler/deSugar/DsExpr.lhs index 5d7ff19..5560d36 100644 --- a/ghc/compiler/deSugar/DsExpr.lhs +++ b/ghc/compiler/deSugar/DsExpr.lhs @@ -22,7 +22,7 @@ import TcHsSyn ( TypecheckedHsExpr, TypecheckedHsBinds, TypecheckedStmt, outPat -- So WATCH OUT; check each use of split*Ty functions. -- Sigh. This is a pain. -import TcType ( tcSplitAppTy, tcSplitFunTys, tcSplitTyConApp_maybe, tcTyConAppArgs, +import TcType ( tcSplitAppTy, tcSplitFunTys, tcTyConAppArgs, isIntegerTy, tcSplitTyConApp, isUnLiftedType, Type ) import Type ( splitFunTys ) import CoreSyn @@ -46,7 +46,7 @@ import DataCon ( DataCon, dataConWrapId, dataConFieldLabels, dataConInstOrigArg import DataCon ( isExistentialDataCon ) import Literal ( Literal(..) ) import TyCon ( tyConDataCons ) -import TysWiredIn ( tupleCon, listTyCon, charDataCon, intDataCon ) +import TysWiredIn ( tupleCon, charDataCon, intDataCon ) import BasicTypes ( RecFlag(..), Boxity(..), ipNameName ) import Maybes ( maybeToBool ) import PrelNames ( hasKey, ratioTyConKey, toPName ) diff --git a/ghc/compiler/deSugar/DsListComp.lhs b/ghc/compiler/deSugar/DsListComp.lhs index 99b8980..88c76f6 100644 --- a/ghc/compiler/deSugar/DsListComp.lhs +++ b/ghc/compiler/deSugar/DsListComp.lhs @@ -11,7 +11,6 @@ module DsListComp ( dsListComp, dsPArrComp ) where import {-# SOURCE #-} DsExpr ( dsExpr, dsLet ) import BasicTypes ( Boxity(..) ) -import DataCon ( dataConId ) import TyCon ( tyConName ) import HsSyn ( OutPat(..), HsExpr(..), Stmt(..), HsMatchContext(..), HsDoContext(..), diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 5267fba..5f82eaf 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -45,7 +45,7 @@ import Id ( idName ) import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser -import Lex ( PState(..), ParseResult(..), ExtFlags(..), mkPState ) +import Lex ( ParseResult(..), ExtFlags(..), mkPState ) import SrcLoc ( mkSrcLoc ) import Finder ( findModule ) import Rename ( checkOldIface, renameModule, closeIfaceDecls ) @@ -81,7 +81,7 @@ import HscStats ( ppSourceStats ) import HscTypes import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName, isGlobalName ) +import Name ( Name, nameModule, nameOccName, getName ) import NameEnv ( emptyNameEnv, mkNameEnv ) import Module ( Module ) diff --git a/ghc/compiler/nativeGen/StixInfo.lhs b/ghc/compiler/nativeGen/StixInfo.lhs index 974a6be..f9e24b9 100644 --- a/ghc/compiler/nativeGen/StixInfo.lhs +++ b/ghc/compiler/nativeGen/StixInfo.lhs @@ -16,7 +16,6 @@ module StixInfo ( #include "NCG.h" import AbsCSyn ( AbstractC(..), Liveness(..), C_SRT(..), needsSRT ) -import StgSyn ( SRT(..) ) import ClosureInfo ( closurePtrsSize, closureNonHdrSize, closureSMRep, infoTableLabelFromCI, diff --git a/ghc/compiler/parser/Parser.y b/ghc/compiler/parser/Parser.y index a478ec4..8b2ef62 100644 --- a/ghc/compiler/parser/Parser.y +++ b/ghc/compiler/parser/Parser.y @@ -1,6 +1,6 @@ {- -*-haskell-*- ----------------------------------------------------------------------------- -$Id: Parser.y,v 1.87 2002/02/12 03:52:08 chak Exp $ +$Id: Parser.y,v 1.88 2002/02/13 14:05:51 simonpj Exp $ Haskell grammar. @@ -21,9 +21,9 @@ import RdrName import PrelNames ( mAIN_Name, unitTyCon_RDR, funTyCon_RDR, listTyCon_RDR, parrTyCon_RDR, tupleTyCon_RDR, unitCon_RDR, nilCon_RDR, tupleCon_RDR ) -import ForeignCall ( Safety(..), CExportSpec(..), CCallSpec(..), +import ForeignCall ( Safety(..), CExportSpec(..), CCallConv(..), CCallTarget(..), defaultCCallConv, - DNCallSpec(..) ) + ) import OccName ( UserFS, varName, tcName, dataName, tcClsName, tvName ) import SrcLoc ( SrcLoc ) import Module diff --git a/ghc/compiler/prelude/PrimOp.lhs b/ghc/compiler/prelude/PrimOp.lhs index 99323ce..4b4f0cc 100644 --- a/ghc/compiler/prelude/PrimOp.lhs +++ b/ghc/compiler/prelude/PrimOp.lhs @@ -30,15 +30,12 @@ import Name ( Name, mkWiredInName ) import RdrName ( RdrName, mkRdrOrig ) import OccName ( OccName, pprOccName, mkVarOcc ) import TyCon ( TyCon, isPrimTyCon, tyConPrimRep ) -import Type ( Type, mkForAllTys, mkFunTy, mkFunTys, typePrimRep, - splitFunTy_maybe, tyConAppTyCon, splitTyConApp - ) +import Type ( Type, mkForAllTys, mkFunTy, mkFunTys, typePrimRep, tyConAppTyCon ) import PprType () -- get at Outputable Type instance. import Unique ( mkPrimOpIdUnique ) import BasicTypes ( Arity, Boxity(..) ) import PrelNames ( pREL_GHC, pREL_GHC_Name ) import Outputable -import Util ( zipWithEqual ) import FastTypes \end{code} diff --git a/ghc/compiler/typecheck/TcDeriv.lhs b/ghc/compiler/typecheck/TcDeriv.lhs index 8e74966..da56ca9 100644 --- a/ghc/compiler/typecheck/TcDeriv.lhs +++ b/ghc/compiler/typecheck/TcDeriv.lhs @@ -30,7 +30,7 @@ import RnEnv ( bindLocatedLocalsRn ) import RnMonad ( renameDerivedCode, thenRn, mapRn, returnRn ) import HscTypes ( DFunId, PersistentRenamerState, FixityEnv ) -import BasicTypes ( Fixity, NewOrData(..) ) +import BasicTypes ( NewOrData(..) ) import Class ( className, classKey, classTyVars, Class ) import ErrUtils ( dumpIfSet_dyn ) import MkId ( mkDictFunId ) @@ -47,7 +47,7 @@ import TyCon ( tyConTyVars, tyConDataCons, tyConArity, newTyConRep, ) import TcType ( TcType, ThetaType, mkTyVarTys, mkTyConApp, getClassPredTys_maybe, isUnLiftedType, mkClassPred, tyVarsOfTypes, tcSplitFunTys, - tcSplitTyConApp_maybe, tcEqTypes, tyVarsOfTheta ) + tcSplitTyConApp_maybe, tcEqTypes ) import Var ( TyVar, tyVarKind ) import VarSet ( mkVarSet, subVarSet ) import PrelNames diff --git a/ghc/compiler/typecheck/TcForeign.lhs b/ghc/compiler/typecheck/TcForeign.lhs index 43c861a..65a1457 100644 --- a/ghc/compiler/typecheck/TcForeign.lhs +++ b/ghc/compiler/typecheck/TcForeign.lhs @@ -34,7 +34,6 @@ import Inst ( emptyLIE, LIE, plusLIE ) import ErrUtils ( Message ) import Id ( Id, mkLocalId ) -import Name ( nameOccName ) import PrimRep ( getPrimRepSize, isFloatingRep ) import Type ( typePrimRep ) import TcType ( Type, tcSplitFunTys, tcSplitTyConApp_maybe, diff --git a/ghc/compiler/typecheck/TcTyClsDecls.lhs b/ghc/compiler/typecheck/TcTyClsDecls.lhs index d38c201..807787f 100644 --- a/ghc/compiler/typecheck/TcTyClsDecls.lhs +++ b/ghc/compiler/typecheck/TcTyClsDecls.lhs @@ -23,7 +23,7 @@ import Module ( Module ) import TcMonad import TcEnv ( TcEnv, RecTcEnv, TcTyThing(..), TyThing(..), TyThingDetails(..), - tcExtendKindEnv, tcLookup, tcExtendGlobalEnv, tcExtendGlobalValEnv, + tcExtendKindEnv, tcLookup, tcExtendGlobalEnv, isLocalThing ) import TcTyDecls ( tcTyDecl, kcConDetails, checkValidTyCon ) import TcClassDcl ( tcClassDecl1, checkValidClass ) diff --git a/ghc/compiler/types/PprType.lhs b/ghc/compiler/types/PprType.lhs index 39ae2ee..f57223c 100644 --- a/ghc/compiler/types/PprType.lhs +++ b/ghc/compiler/types/PprType.lhs @@ -33,7 +33,6 @@ import TyCon ( TyCon, isPrimTyCon, isTupleTyCon, tupleTyConBoxity, ) -- others: -import CmdLineOpts ( opt_PprStyle_RawTypes ) import Maybes ( maybeToBool ) import Name ( getOccString, getOccName ) import OccName ( occNameUserString ) -- 1.7.10.4