Commit a5ded1f8 authored by simonpj's avatar simonpj
Browse files

[project @ 2001-06-25 14:36:04 by simonpj]

Import wibbles
parent f00281df
......@@ -75,7 +75,6 @@ cgTopRhsCon id con args
name = idName id
closure_label = mkClosureLabel name
lf_info = mkConLFInfo con
cg_id_info = stableAmodeIdInfo id (CLbl closure_label PtrRep) lf_info
in
(
......
%
% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
%
% $Id: CgTailCall.lhs,v 1.29 2000/12/06 13:19:49 simonmar Exp $
% $Id: CgTailCall.lhs,v 1.30 2001/06/25 14:36:04 simonpj Exp $
%
%********************************************************
%* *
......@@ -39,8 +39,7 @@ import CgRetConv ( dataReturnConvPrim,
import CgStackery ( mkTaggedStkAmodes, adjustStackHW )
import CgUsages ( getSpRelOffset, adjustSpAndHp )
import CgUpdate ( pushSeqFrame )
import CLabel ( mkUpdInfoLabel, mkRtsPrimOpLabel,
mkBlackHoleInfoTableLabel )
import CLabel ( mkUpdInfoLabel, mkRtsPrimOpLabel )
import ClosureInfo ( nodeMustPointToIt,
getEntryConvention, EntryConvention(..), LambdaFormInfo
)
......
......@@ -49,7 +49,6 @@ module SMRep (
#include "HsVersions.h"
import CmdLineOpts
import AbsCSyn ( Liveness(..) )
import Constants ( sTD_HDR_SIZE, pROF_HDR_SIZE,
gRAN_HDR_SIZE, tICKY_HDR_SIZE,
aRR_WORDS_HDR_SIZE, aRR_PTRS_HDR_SIZE,
......
......@@ -11,7 +11,6 @@ module MkExternalCore (
import qualified ExternalCore as C
import Char
import Ratio
import Module
import CoreSyn
import HscTypes
......@@ -22,13 +21,10 @@ import DataCon
import CoreSyn
import Var
import IdInfo
import NameEnv
import Literal
import Name
import CostCentre
import Outputable
import PrimOp
import Class
import ForeignCall
import PprExternalCore
import CmdLineOpts
......
......@@ -6,7 +6,7 @@ module CprAnalyse ( cprAnalyse ) where
#include "HsVersions.h"
import CmdLineOpts ( DynFlags, DynFlag(..), dopt )
import CmdLineOpts ( DynFlags, DynFlag(..) )
import CoreLint ( showPass, endPass )
import CoreSyn
import CoreUtils ( exprIsValue )
......@@ -91,10 +91,6 @@ data AbsVal = Top -- Not a constructed product
-- we could use appropriate Tuple Vals
deriving (Eq,Show)
isFun :: AbsVal -> Bool
isFun (Fun _) = True
isFun _ = False
-- For pretty debugging
instance Outputable AbsVal where
ppr Top = ptext SLIT("Top")
......
......@@ -18,7 +18,7 @@ import CoreSyn
import DsMonad
import CoreUtils ( exprType, mkCoerce )
import CoreUtils ( exprType )
import Id ( Id, mkWildId, idType )
import MkId ( mkFCallId, realWorldPrimId, mkPrimOpId )
import Maybes ( maybeToBool )
......@@ -31,7 +31,6 @@ import TcType ( isUnLiftedType, mkFunTys,
tcEqType, isBoolTy, isUnitTy,
Type
)
import Type ( repType )
import PrimOp ( PrimOp(TouchOp) )
import TysPrim ( realWorldStatePrimTy,
byteArrayPrimTyCon, mutableByteArrayPrimTyCon,
......
......@@ -13,11 +13,9 @@ import HsSyn ( failureFreePat,
HsExpr(..), OutPat(..), HsLit(..), ArithSeqInfo(..),
Stmt(..), HsMatchContext(..), HsDoContext(..),
Match(..), HsBinds(..), MonoBinds(..),
mkSimpleMatch, isDoExpr
)
import TcHsSyn ( TypecheckedHsExpr, TypecheckedHsBinds,
TypecheckedStmt, TypecheckedMatchContext
mkSimpleMatch
)
import TcHsSyn ( TypecheckedHsExpr, TypecheckedHsBinds, TypecheckedStmt )
import TcType ( tcSplitAppTy, tcSplitFunTys, tcSplitTyConApp_maybe, tcTyConAppArgs,
isIntegerTy, tcSplitTyConApp, isUnLiftedType, Type )
import CoreSyn
......
......@@ -17,7 +17,6 @@ import HsImpExp ( isOperator )
-- others:
import ForeignCall ( Safety )
import Name ( Name )
import Outputable
import PprType ( pprParendType )
import Type ( Type )
......
......@@ -27,7 +27,7 @@ module HsTypes (
#include "HsVersions.h"
import Class ( FunDep )
import TcType ( Type, Kind, ThetaType, SourceType(..), PredType,
import TcType ( Type, Kind, ThetaType, SourceType(..),
tcSplitSigmaTy, liftedTypeKind, eqKind, tcEqType
)
import TypeRep ( Type(..), TyNote(..) ) -- toHsType sees the representation
......
......@@ -49,8 +49,7 @@ import Panic ( progName, GhcException(..) )
import Util ( global )
import CmdLineOpts ( dynFlag, verbosity )
import List ( isPrefixOf )
import Exception ( throw, throwDyn, catchAllIO )
import Exception ( throwDyn, catchAllIO )
import IO ( hPutStr, hPutChar, hPutStrLn, hFlush, stderr )
import Directory ( doesFileExist, removeFile )
import IOExts ( IORef, readIORef, writeIORef )
......@@ -69,7 +68,8 @@ import Int
#if !defined(mingw32_TARGET_OS)
import qualified Posix
#else
import Addr ( nullAddr )
import Addr ( nullAddr )
import List ( isPrefixOf )
#endif
#include "HsVersions.h"
......@@ -565,9 +565,8 @@ interpreted a command line 'foo\baz' as 'foobaz'.
-----------------------------------------------------------------------------
-- Convert filepath into MSDOS form.
dosifyPath :: String -> String
dosifyPaths :: [String] -> [String]
-- dosifyPath does two things
-- dosifyPaths does two things
-- a) change '/' to '\'
-- b) remove initial '/cygdrive/'
......@@ -595,7 +594,6 @@ dosifyPath stuff
#else
--------------------- Unix version ---------------------
dosifyPath p = p
dosifyPaths ps = ps
unDosifyPath xs = subst '\\' '/' xs
--------------------------------------------------------
......
......@@ -42,7 +42,7 @@ import CmdLineOpts ( opt_HiVersion, opt_NoHiCheck )
import ForeignCall ( Safety(..) )
import Demand ( Demand(..) {- instance Read -} )
import UniqFM ( listToUFM, lookupUFM )
import BasicTypes ( NewOrData(..), Boxity(..) )
import BasicTypes ( Boxity(..) )
import SrcLoc ( SrcLoc, incSrcLine, srcLocFile, srcLocLine,
replaceSrcLine, mkSrcLoc )
......
......@@ -61,7 +61,6 @@ module RdrHsSyn (
#include "HsVersions.h"
import HsSyn -- Lots of it
import HsPat ( collectSigTysFromPats )
import OccName ( mkClassTyConOcc, mkClassDataConOcc, mkWorkerOcc,
mkSuperDictSelOcc, mkDefaultMethodOcc, mkGenOcc1,
mkGenOcc2,
......
......@@ -10,7 +10,7 @@ module CSE (
#include "HsVersions.h"
import CmdLineOpts ( DynFlag(..), DynFlags, dopt )
import CmdLineOpts ( DynFlag(..), DynFlags )
import Id ( Id, idType )
import CoreUtils ( hashExpr, cheapEqExpr, exprIsBig, mkAltExpr )
import DataCon ( isUnboxedTupleCon )
......
......@@ -16,7 +16,7 @@ module FloatIn ( floatInwards ) where
#include "HsVersions.h"
import CmdLineOpts ( DynFlags, DynFlag(..), dopt )
import CmdLineOpts ( DynFlags, DynFlag(..) )
import CoreSyn
import CoreUtils ( exprIsValue, exprIsDupable )
import CoreLint ( showPass, endPass )
......
......@@ -8,14 +8,13 @@ module LiberateCase ( liberateCase ) where
#include "HsVersions.h"
import CmdLineOpts ( DynFlags, DynFlag(..), dopt, opt_LiberateCaseThreshold )
import CmdLineOpts ( DynFlags, DynFlag(..), opt_LiberateCaseThreshold )
import CoreLint ( showPass, endPass )
import CoreSyn
import CoreUnfold ( couldBeSmallEnoughToInline )
import Var ( Id )
import VarEnv
import UniqFM ( ufmToList )
import Maybes
import Outputable
\end{code}
......
......@@ -19,7 +19,7 @@ module SimplUtils (
#include "HsVersions.h"
import CmdLineOpts ( switchIsOn, SimplifierSwitch(..),
opt_SimplDoLambdaEtaExpansion, opt_SimplCaseMerge, opt_DictsStrict,
opt_SimplDoLambdaEtaExpansion, opt_SimplCaseMerge,
opt_UF_UpdateInPlace
)
import CoreSyn
......@@ -38,7 +38,7 @@ import Maybes ( maybeToBool, catMaybes )
import Name ( setNameUnique )
import Demand ( isStrict )
import SimplMonad
import Type ( Type, mkForAllTys, seqType, repType,
import Type ( Type, mkForAllTys, seqType,
splitTyConApp_maybe, tyConAppArgs, mkTyVarTys,
isUnLiftedType,
splitRepFunTys
......
......@@ -31,7 +31,6 @@ import VarSet
import VarEnv
import TcType ( mkTyVarTy )
import qualified TcType ( match )
import TypeRep ( Type(..) ) -- Can see type representation for matching
import Outputable
import Maybe ( isJust, isNothing, fromMaybe )
......
......@@ -9,9 +9,7 @@ module Specialise ( specProgram ) where
#include "HsVersions.h"
import CmdLineOpts ( DynFlags, DynFlag(..) )
import Id ( Id, idName, idType, mkUserLocal,
idSpecialisation, modifyIdInfo
)
import Id ( Id, idName, idType, mkUserLocal, idSpecialisation )
import TcType ( Type, mkTyVarTy, tcSplitSigmaTy,
tyVarsOfTypes, tyVarsOfTheta,
mkForAllTys, tcCmpType
......@@ -1098,12 +1096,6 @@ splitUDs bndrs uds@(MkUD {dict_binds = orig_dbs,
%************************************************************************
\begin{code}
lookupId:: IdEnv Id -> Id -> Id
lookupId env id = case lookupVarEnv env id of
Nothing -> id
Just id' -> id'
----------------------------------------
type SpecM a = UniqSM a
thenSM = thenUs
......
......@@ -26,7 +26,6 @@ import Demand ( Demand(..), wwPrim, wwStrict, wwUnpack, wwLazy,
)
import SaLib
import TyCon ( isProductTyCon, isRecursiveTyCon )
import BasicTypes ( NewOrData(..) )
import Type ( splitTyConApp_maybe,
isUnLiftedType, Type )
import TyCon ( tyConUnique )
......
......@@ -15,7 +15,7 @@ import CoreUtils ( exprType )
import Id ( Id, idType, idStrictness, idArity, isOneShotLambda,
setIdStrictness, idInlinePragma, mkWorkerId,
setIdWorkerInfo, idCprInfo, setInlinePragma )
import Type ( Type, splitForAllTys, splitFunTys )
import Type ( Type )
import IdInfo ( mkStrictnessInfo, noStrictnessInfo, StrictnessInfo(..),
CprInfo(..), InlinePragInfo(..), isNeverInlinePrag,
WorkerInfo(..)
......
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