Commit da0e7b0f authored by simonpj's avatar simonpj
Browse files

[project @ 2002-02-14 13:59:22 by simonpj]

Import wibbles
parent 89577706
...@@ -59,7 +59,6 @@ import BitSet ( BitSet, intBS ) ...@@ -59,7 +59,6 @@ import BitSet ( BitSet, intBS )
import Outputable import Outputable
import GlaExts import GlaExts
import Util ( lengthExceeds, listLengthCmp ) import Util ( lengthExceeds, listLengthCmp )
import Maybe ( isNothing, maybeToList )
import ST import ST
......
...@@ -48,8 +48,7 @@ import DataCon ( DataCon, dataConName, dataConTag, ...@@ -48,8 +48,7 @@ import DataCon ( DataCon, dataConName, dataConTag,
isUnboxedTupleCon, isNullaryDataCon, dataConId, isUnboxedTupleCon, isNullaryDataCon, dataConId,
dataConWrapId, dataConRepArity dataConWrapId, dataConRepArity
) )
import Id ( Id, idName, idPrimRep, idCafInfo ) import Id ( Id, idName, idPrimRep )
import IdInfo ( mayHaveCafRefs )
import Literal ( Literal(..) ) import Literal ( Literal(..) )
import PrelInfo ( maybeCharLikeCon, maybeIntLikeCon ) import PrelInfo ( maybeCharLikeCon, maybeIntLikeCon )
import PrimRep ( PrimRep(..), isFollowableRep ) import PrimRep ( PrimRep(..), isFollowableRep )
......
...@@ -14,7 +14,7 @@ import CoreUtils( exprType, exprIsValue, etaExpand, exprArity, exprOkForSpeculat ...@@ -14,7 +14,7 @@ import CoreUtils( exprType, exprIsValue, etaExpand, exprArity, exprOkForSpeculat
import CoreFVs ( exprFreeVars ) import CoreFVs ( exprFreeVars )
import CoreLint ( endPass ) import CoreLint ( endPass )
import CoreSyn import CoreSyn
import Type ( Type, applyTy, splitFunTy_maybe, isTyVarTy, import Type ( Type, applyTy, splitFunTy_maybe,
isUnLiftedType, isUnboxedTupleType, repType, seqType ) isUnLiftedType, isUnboxedTupleType, repType, seqType )
import NewDemand ( Demand, isStrictDmd, lazyDmd, StrictSig(..), DmdType(..) ) import NewDemand ( Demand, isStrictDmd, lazyDmd, StrictSig(..), DmdType(..) )
import PrimOp ( PrimOp(..) ) import PrimOp ( PrimOp(..) )
......
...@@ -48,12 +48,11 @@ import Name ( hashName ) ...@@ -48,12 +48,11 @@ import Name ( hashName )
import Literal ( hashLiteral, literalType, litIsDupable, isZeroLit ) import Literal ( hashLiteral, literalType, litIsDupable, isZeroLit )
import DataCon ( DataCon, dataConRepArity, dataConArgTys, isExistentialDataCon, dataConTyCon ) import DataCon ( DataCon, dataConRepArity, dataConArgTys, isExistentialDataCon, dataConTyCon )
import PrimOp ( PrimOp(..), primOpOkForSpeculation, primOpIsCheap ) import PrimOp ( PrimOp(..), primOpOkForSpeculation, primOpIsCheap )
import Id ( Id, idType, globalIdDetails, idNewStrictness, idLBVarInfo, import Id ( Id, idType, globalIdDetails, idNewStrictness,
mkWildId, idArity, idName, idUnfolding, idInfo, isOneShotLambda, mkWildId, idArity, idName, idUnfolding, idInfo, isOneShotLambda,
isDataConId_maybe, mkSysLocal, isDataConId, isBottomingId isDataConId_maybe, mkSysLocal, isDataConId, isBottomingId
) )
import IdInfo ( LBVarInfo(..), import IdInfo ( GlobalIdDetails(..),
GlobalIdDetails(..),
megaSeqIdInfo ) megaSeqIdInfo )
import NewDemand ( appIsBottom ) import NewDemand ( appIsBottom )
import Type ( Type, mkFunTy, mkForAllTy, splitFunTy_maybe, splitFunTy, import Type ( Type, mkFunTy, mkForAllTy, splitFunTy_maybe, splitFunTy,
......
...@@ -11,7 +11,7 @@ module RnHsSyn where ...@@ -11,7 +11,7 @@ module RnHsSyn where
import HsSyn import HsSyn
import HsCore import HsCore
import Class ( FunDep, DefMeth(..) ) import Class ( FunDep, DefMeth(..) )
import TyCon ( DataConDetails, visibleDataCons ) import TyCon ( visibleDataCons )
import TysWiredIn ( tupleTyCon, listTyCon, parrTyCon, charTyCon ) import TysWiredIn ( tupleTyCon, listTyCon, parrTyCon, charTyCon )
import Name ( Name, getName, isTyVarName ) import Name ( Name, getName, isTyVarName )
import NameSet import NameSet
......
...@@ -18,9 +18,7 @@ import ErrUtils ( dumpIfSet_dyn ) ...@@ -18,9 +18,7 @@ import ErrUtils ( dumpIfSet_dyn )
import CostCentre ( dupifyCC, CostCentre ) import CostCentre ( dupifyCC, CostCentre )
import Id ( Id ) import Id ( Id )
import CoreLint ( showPass, endPass ) import CoreLint ( showPass, endPass )
import SetLevels ( setLevels, isInlineCtxt, import SetLevels ( setLevels, Level(..), ltMajLvl, ltLvl, isTopLvl )
Level(..), tOP_LEVEL, ltMajLvl, ltLvl, isTopLvl
)
import UniqSupply ( UniqSupply ) import UniqSupply ( UniqSupply )
import List ( partition ) import List ( partition )
import Outputable import Outputable
......
...@@ -34,7 +34,6 @@ module Inst ( ...@@ -34,7 +34,6 @@ module Inst (
#include "HsVersions.h" #include "HsVersions.h"
import CmdLineOpts ( opt_NoMethodSharing )
import HsSyn ( HsLit(..), HsOverLit(..), HsExpr(..) ) import HsSyn ( HsLit(..), HsOverLit(..), HsExpr(..) )
import TcHsSyn ( TcExpr, TcId, TypecheckedHsExpr, import TcHsSyn ( TcExpr, TcId, TypecheckedHsExpr,
mkHsTyApp, mkHsDictApp, mkHsConApp, zonkId mkHsTyApp, mkHsDictApp, mkHsConApp, zonkId
......
...@@ -690,7 +690,7 @@ zonkPat (TuplePat pats boxed) ...@@ -690,7 +690,7 @@ zonkPat (TuplePat pats boxed)
returnNF_Tc (TuplePat new_pats boxed, ids) returnNF_Tc (TuplePat new_pats boxed, ids)
zonkPat (ConPat n ty tvs dicts pats) 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 zonkTcTyVarToTyVar tvs `thenNF_Tc` \ new_tvs ->
mapNF_Tc zonkIdBndr dicts `thenNF_Tc` \ new_dicts -> mapNF_Tc zonkIdBndr dicts `thenNF_Tc` \ new_dicts ->
tcExtendGlobalValEnv new_dicts $ tcExtendGlobalValEnv new_dicts $
......
...@@ -67,7 +67,6 @@ import BasicTypes ( Arity, RecFlag(..), Boxity(..), ...@@ -67,7 +67,6 @@ import BasicTypes ( Arity, RecFlag(..), Boxity(..),
import Name ( Name, nameUnique, NamedThing(getName) ) import Name ( Name, nameUnique, NamedThing(getName) )
import PrelNames ( Unique, Uniquable(..), anyBoxConKey ) import PrelNames ( Unique, Uniquable(..), anyBoxConKey )
import PrimRep ( PrimRep(..), isFollowableRep ) import PrimRep ( PrimRep(..), isFollowableRep )
import Util ( lengthIs )
import Maybes ( expectJust ) import Maybes ( expectJust )
import Outputable import Outputable
import FastString import FastString
......
...@@ -85,7 +85,7 @@ import {-# SOURCE #-} PprType( pprType ) -- Only called in debug messages ...@@ -85,7 +85,7 @@ import {-# SOURCE #-} PprType( pprType ) -- Only called in debug messages
import {-# SOURCE #-} Subst ( substTyWith ) import {-# SOURCE #-} Subst ( substTyWith )
-- friends: -- friends:
import Var ( Var, TyVar, tyVarKind, tyVarName, setTyVarName ) import Var ( TyVar, tyVarKind, tyVarName, setTyVarName )
import VarEnv import VarEnv
import VarSet import VarSet
...@@ -101,7 +101,6 @@ import TyCon ( TyCon, isRecursiveTyCon, isPrimTyCon, ...@@ -101,7 +101,6 @@ import TyCon ( TyCon, isRecursiveTyCon, isPrimTyCon,
-- others -- others
import CmdLineOpts ( opt_DictsStrict ) import CmdLineOpts ( opt_DictsStrict )
import Maybes ( maybeToBool )
import SrcLoc ( noSrcLoc ) import SrcLoc ( noSrcLoc )
import PrimRep ( PrimRep(..) ) import PrimRep ( PrimRep(..) )
import Unique ( Uniquable(..) ) import Unique ( Uniquable(..) )
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment