From da0e7b0f5989c163b1cf79d493877d854ab1c279 Mon Sep 17 00:00:00 2001 From: simonpj Date: Thu, 14 Feb 2002 13:59:24 +0000 Subject: [PATCH] [project @ 2002-02-14 13:59:22 by simonpj] Import wibbles --- ghc/compiler/absCSyn/PprAbsC.lhs | 1 - ghc/compiler/codeGen/CgCon.lhs | 3 +-- ghc/compiler/coreSyn/CorePrep.lhs | 2 +- ghc/compiler/coreSyn/CoreUtils.lhs | 5 ++--- ghc/compiler/rename/RnHsSyn.lhs | 2 +- ghc/compiler/simplCore/FloatOut.lhs | 4 +--- ghc/compiler/typecheck/Inst.lhs | 1 - ghc/compiler/typecheck/TcHsSyn.lhs | 2 +- ghc/compiler/types/TyCon.lhs | 1 - ghc/compiler/types/Type.lhs | 3 +-- 10 files changed, 8 insertions(+), 16 deletions(-) diff --git a/ghc/compiler/absCSyn/PprAbsC.lhs b/ghc/compiler/absCSyn/PprAbsC.lhs index 64f8048..ecd5bf8 100644 --- a/ghc/compiler/absCSyn/PprAbsC.lhs +++ b/ghc/compiler/absCSyn/PprAbsC.lhs @@ -59,7 +59,6 @@ import BitSet ( BitSet, intBS ) import Outputable import GlaExts import Util ( lengthExceeds, listLengthCmp ) -import Maybe ( isNothing, maybeToList ) import ST diff --git a/ghc/compiler/codeGen/CgCon.lhs b/ghc/compiler/codeGen/CgCon.lhs index db81d25..3b91214 100644 --- a/ghc/compiler/codeGen/CgCon.lhs +++ b/ghc/compiler/codeGen/CgCon.lhs @@ -48,8 +48,7 @@ import DataCon ( DataCon, dataConName, dataConTag, isUnboxedTupleCon, isNullaryDataCon, dataConId, dataConWrapId, dataConRepArity ) -import Id ( Id, idName, idPrimRep, idCafInfo ) -import IdInfo ( mayHaveCafRefs ) +import Id ( Id, idName, idPrimRep ) import Literal ( Literal(..) ) import PrelInfo ( maybeCharLikeCon, maybeIntLikeCon ) import PrimRep ( PrimRep(..), isFollowableRep ) diff --git a/ghc/compiler/coreSyn/CorePrep.lhs b/ghc/compiler/coreSyn/CorePrep.lhs index 63c1d95..3d4caf2 100644 --- a/ghc/compiler/coreSyn/CorePrep.lhs +++ b/ghc/compiler/coreSyn/CorePrep.lhs @@ -14,7 +14,7 @@ import CoreUtils( exprType, exprIsValue, etaExpand, exprArity, exprOkForSpeculat import CoreFVs ( exprFreeVars ) import CoreLint ( endPass ) import CoreSyn -import Type ( Type, applyTy, splitFunTy_maybe, isTyVarTy, +import Type ( Type, applyTy, splitFunTy_maybe, isUnLiftedType, isUnboxedTupleType, repType, seqType ) import NewDemand ( Demand, isStrictDmd, lazyDmd, StrictSig(..), DmdType(..) ) import PrimOp ( PrimOp(..) ) diff --git a/ghc/compiler/coreSyn/CoreUtils.lhs b/ghc/compiler/coreSyn/CoreUtils.lhs index d7a91a0..87709fd 100644 --- a/ghc/compiler/coreSyn/CoreUtils.lhs +++ b/ghc/compiler/coreSyn/CoreUtils.lhs @@ -48,12 +48,11 @@ import Name ( hashName ) import Literal ( hashLiteral, literalType, litIsDupable, isZeroLit ) import DataCon ( DataCon, dataConRepArity, dataConArgTys, isExistentialDataCon, dataConTyCon ) import PrimOp ( PrimOp(..), primOpOkForSpeculation, primOpIsCheap ) -import Id ( Id, idType, globalIdDetails, idNewStrictness, idLBVarInfo, +import Id ( Id, idType, globalIdDetails, idNewStrictness, mkWildId, idArity, idName, idUnfolding, idInfo, isOneShotLambda, isDataConId_maybe, mkSysLocal, isDataConId, isBottomingId ) -import IdInfo ( LBVarInfo(..), - GlobalIdDetails(..), +import IdInfo ( GlobalIdDetails(..), megaSeqIdInfo ) import NewDemand ( appIsBottom ) import Type ( Type, mkFunTy, mkForAllTy, splitFunTy_maybe, splitFunTy, diff --git a/ghc/compiler/rename/RnHsSyn.lhs b/ghc/compiler/rename/RnHsSyn.lhs index d3f9c74..df20eb0 100644 --- a/ghc/compiler/rename/RnHsSyn.lhs +++ b/ghc/compiler/rename/RnHsSyn.lhs @@ -11,7 +11,7 @@ module RnHsSyn where import HsSyn import HsCore import Class ( FunDep, DefMeth(..) ) -import TyCon ( DataConDetails, visibleDataCons ) +import TyCon ( visibleDataCons ) import TysWiredIn ( tupleTyCon, listTyCon, parrTyCon, charTyCon ) import Name ( Name, getName, isTyVarName ) import NameSet diff --git a/ghc/compiler/simplCore/FloatOut.lhs b/ghc/compiler/simplCore/FloatOut.lhs index 683f71b..a1cb821 100644 --- a/ghc/compiler/simplCore/FloatOut.lhs +++ b/ghc/compiler/simplCore/FloatOut.lhs @@ -18,9 +18,7 @@ import ErrUtils ( dumpIfSet_dyn ) import CostCentre ( dupifyCC, CostCentre ) import Id ( Id ) import CoreLint ( showPass, endPass ) -import SetLevels ( setLevels, isInlineCtxt, - Level(..), tOP_LEVEL, ltMajLvl, ltLvl, isTopLvl - ) +import SetLevels ( setLevels, Level(..), ltMajLvl, ltLvl, isTopLvl ) import UniqSupply ( UniqSupply ) import List ( partition ) import Outputable diff --git a/ghc/compiler/typecheck/Inst.lhs b/ghc/compiler/typecheck/Inst.lhs index 7d51052..3805b9b 100644 --- a/ghc/compiler/typecheck/Inst.lhs +++ b/ghc/compiler/typecheck/Inst.lhs @@ -34,7 +34,6 @@ module Inst ( #include "HsVersions.h" -import CmdLineOpts ( opt_NoMethodSharing ) import HsSyn ( HsLit(..), HsOverLit(..), HsExpr(..) ) import TcHsSyn ( TcExpr, TcId, TypecheckedHsExpr, mkHsTyApp, mkHsDictApp, mkHsConApp, zonkId diff --git a/ghc/compiler/typecheck/TcHsSyn.lhs b/ghc/compiler/typecheck/TcHsSyn.lhs index 39661e4..d691ab4 100644 --- a/ghc/compiler/typecheck/TcHsSyn.lhs +++ b/ghc/compiler/typecheck/TcHsSyn.lhs @@ -690,7 +690,7 @@ zonkPat (TuplePat pats boxed) returnNF_Tc (TuplePat new_pats boxed, ids) zonkPat (ConPat n ty tvs dicts pats) - = zonkTcTypeToType ty `thenNF_Tc` \ new_ty -> + = zonkTcTypeToType ty `thenNF_Tc` \ new_ty -> mapNF_Tc zonkTcTyVarToTyVar tvs `thenNF_Tc` \ new_tvs -> mapNF_Tc zonkIdBndr dicts `thenNF_Tc` \ new_dicts -> tcExtendGlobalValEnv new_dicts $ diff --git a/ghc/compiler/types/TyCon.lhs b/ghc/compiler/types/TyCon.lhs index 8a03de1..642f246 100644 --- a/ghc/compiler/types/TyCon.lhs +++ b/ghc/compiler/types/TyCon.lhs @@ -67,7 +67,6 @@ import BasicTypes ( Arity, RecFlag(..), Boxity(..), import Name ( Name, nameUnique, NamedThing(getName) ) import PrelNames ( Unique, Uniquable(..), anyBoxConKey ) import PrimRep ( PrimRep(..), isFollowableRep ) -import Util ( lengthIs ) import Maybes ( expectJust ) import Outputable import FastString diff --git a/ghc/compiler/types/Type.lhs b/ghc/compiler/types/Type.lhs index e34c924..7c1adf7 100644 --- a/ghc/compiler/types/Type.lhs +++ b/ghc/compiler/types/Type.lhs @@ -85,7 +85,7 @@ import {-# SOURCE #-} PprType( pprType ) -- Only called in debug messages import {-# SOURCE #-} Subst ( substTyWith ) -- friends: -import Var ( Var, TyVar, tyVarKind, tyVarName, setTyVarName ) +import Var ( TyVar, tyVarKind, tyVarName, setTyVarName ) import VarEnv import VarSet @@ -101,7 +101,6 @@ import TyCon ( TyCon, isRecursiveTyCon, isPrimTyCon, -- others import CmdLineOpts ( opt_DictsStrict ) -import Maybes ( maybeToBool ) import SrcLoc ( noSrcLoc ) import PrimRep ( PrimRep(..) ) import Unique ( Uniquable(..) ) -- 1.7.10.4