Commit be33dbc9 authored by simonm's avatar simonm

[project @ 1998-02-03 17:13:54 by simonm]

- Fixes for bootstrapping with 3.01.
  - Use 'official' extension interfaces rather than internal prelude
    modules (such as ArrBase) where possible.
  - Remove some cruft.
  - Delete some unused imports found by '-fwarn-unused-imports'.
parent c29022c4
......@@ -43,9 +43,6 @@ you will screw up the layout where they are used in case expressions!
# define seqStrictlyST seqST
# define thenStrictlyST thenST
# define returnStrictlyST return
# define _readHandle IOHandle.readHandle
# define _writeHandle IOHandle.writeHandle
# define _newHandle IOHandle.newdHandle
# define MkST ST
# if __GLASGOW_HASKELL__ >= 209
# define STATE_TOK(x) x
......@@ -61,7 +58,6 @@ you will screw up the layout where they are used in case expressions!
# define failWith fail
# define MkIOError(h,errt,msg) (IOError (Just h) errt msg)
# define CCALL_THEN thenIO_Prim
# define _filePtr IOHandle.filePtr
# define Text Show
# define IMP_FASTSTRING() import FastString
# if __GLASGOW_HASKELL__ >= 209
......@@ -93,9 +89,10 @@ you will screw up the layout where they are used in case expressions!
#if defined(__GLASGOW_HASKELL__)
-- Import the beggars
import GlaExts ( Int(..), Int#, (+#), (-#), (*#),
quotInt#, negateInt#, (==#), (<#), (<=#), (>=#), (>#)
)
import GlaExts
( Int(..), Int#, (+#), (-#), (*#),
quotInt#, negateInt#, (==#), (<#), (<=#), (>=#), (>#)
)
#define FAST_INT Int#
#define ILIT(x) (x#)
......@@ -146,24 +143,22 @@ import GlaExts ( Int(..), Int#, (+#), (-#), (*#),
-- when compiling FastString itself
#ifndef COMPILING_FAST_STRING
--
import FastString ( FastString, mkFastString, mkFastCharString#, nullFastString,
consFS, headFS, tailFS, lengthFS, unpackFS, appendFS, concatFS
)
import qualified FastString
#endif
# define USE_FAST_STRINGS 1
# define FAST_STRING FastString
# define SLIT(x) (mkFastCharString# (x#))
# define _NULL_ nullFastString
# define _NIL_ (mkFastString "")
# define _CONS_ consFS
# define _HEAD_ headFS
# define _TAIL_ tailFS
# define _LENGTH_ lengthFS
# define _PK_ mkFastString
# define _UNPK_ unpackFS
# define _APPEND_ `appendFS`
# define _CONCAT_ concatFS
# define FAST_STRING FastString.FastString
# define SLIT(x) (FastString.mkFastCharString# (x#))
# define _NULL_ FastString.nullFastString
# define _NIL_ (FastString.mkFastString "")
# define _CONS_ FastString.consFS
# define _HEAD_ FastString.headFS
# define _TAIL_ FastString.tailFS
# define _LENGTH_ FastString.lengthFS
# define _PK_ FastString.mkFastString
# define _UNPK_ FastString.unpackFS
# define _APPEND_ `FastString.appendFS`
# define _CONCAT_ FastString.concatFS
#else
# define FAST_STRING String
# define SLIT(x) (x)
......
......@@ -148,23 +148,20 @@ import BasicTypes ( Arity )
import IdInfo
import Maybes ( maybeToBool )
import Name ( nameUnique, mkLocalName, mkSysLocalName, isLocalName,
mkCompoundName,
isLocallyDefinedName, occNameString, modAndOcc,
isLocallyDefined, changeUnique, isWiredInName,
nameString, getOccString, setNameVisibility,
isExported, ExportFlag(..), Provenance,
mkCompoundName, occNameString, modAndOcc,
changeUnique, isWiredInName, setNameVisibility,
ExportFlag(..), Provenance,
OccName(..), Name, Module,
NamedThing(..)
)
import PrimOp ( PrimOp )
import PrelMods ( pREL_TUP, pREL_BASE )
import Lex ( mkTupNameStr )
import FieldLabel ( fieldLabelName, FieldLabel(..){-instances-} )
import PragmaInfo ( PragmaInfo(..) )
import SrcLoc ( mkBuiltinSrcLoc )
import TysWiredIn ( tupleTyCon )
import TyCon ( TyCon, tyConDataCons, isDataTyCon, isNewTyCon, mkSpecTyCon )
import Type ( mkSigmaTy, mkTyVarTys, mkFunTys, splitSigmaTy,
import Type ( mkSigmaTy, mkTyVarTys, mkFunTys,
mkTyConApp, instantiateTy, mkForAllTys,
tyVarsOfType, instantiateTy, typePrimRep,
instantiateTauTy,
......@@ -175,10 +172,10 @@ import TyVar ( TyVar, alphaTyVars, isEmptyTyVarSet,
)
import UniqFM
import UniqSet -- practically all of it
import Unique ( getBuiltinUniques, pprUnique, Unique, Uniquable(..) )
import Unique ( getBuiltinUniques, Unique, Uniquable(..) )
import Outputable
import SrcLoc ( SrcLoc )
import Util ( mapAccumL, nOfThem, zipEqual, assoc )
import Util ( nOfThem, assoc )
import GlaExts ( Int# )
\end{code}
......
......@@ -54,13 +54,9 @@ import SpecEnv ( SpecEnv, emptySpecEnv, isEmptySpecEnv )
import BasicTypes ( NewOrData )
import Demand
import Maybes ( firstJust )
import Outputable
import Unique ( pprUnique )
import Util ( mapAccumL )
ord = fromEnum :: Char -> Int
showTypeCategory = panic "IdInfo.showTypeCategory"
import Char ( ord )
\end{code}
An @IdInfo@ gives {\em optional} information about an @Id@. If
......@@ -376,11 +372,7 @@ updateInfoMaybe (SomeUpdateInfo u) = Just u
Text instance so that the update annotations can be read in.
\begin{code}
#ifdef REALLY_HASKELL_1_3
instance Read UpdateInfo where
#else
instance Text UpdateInfo where
#endif
readsPrec p s | null s = panic "IdInfo: empty update pragma?!"
| otherwise = [(SomeUpdateInfo (map ok_digit s),"")]
where
......@@ -429,8 +421,10 @@ argUsageInfo (IdInfo _ _ _ _ _ _ au _) = au
addArgUsageInfo id_info NoArgUsageInfo = id_info
addArgUsageInfo (IdInfo a b d e f g _ h) au_info = IdInfo a b d e f g au_info h
{- UNUSED:
ppArgUsageInfo NoArgUsageInfo = empty
ppArgUsageInfo (SomeArgUsageInfo aut) = (<>) (ptext SLIT("_L_ ")) (ppArgUsageType aut)
-}
ppArgUsage (ArgUsage n) = int n
ppArgUsage (UnknownArgUsage) = char '-'
......
......@@ -9,15 +9,14 @@ module IdUtils ( primOpName ) where
#include "HsVersions.h"
import CoreSyn
import CoreUnfold ( UnfoldingGuidance(..), Unfolding, mkUnfolding )
import CoreUnfold ( Unfolding )
import Id ( mkPrimitiveId )
import IdInfo -- quite a few things
import StdIdInfo
import Name ( mkWiredInIdName, Name )
import PrimOp ( primOpInfo, tagOf_PrimOp, primOp_str,
PrimOpInfo(..), PrimOpResultInfo(..), PrimOp )
import PrimOp ( primOpInfo, tagOf_PrimOp, PrimOpInfo(..), PrimOp )
import PrelMods ( pREL_GHC )
import Type ( mkForAllTys, mkFunTy, mkFunTys, mkTyVarTy, mkTyConApp )
import Type ( mkForAllTys, mkFunTy, mkFunTys, mkTyConApp )
import TysWiredIn ( boolTy )
import Unique ( mkPrimOpIdUnique )
import Util ( panic )
......
......@@ -57,11 +57,11 @@ module Name (
import {-# SOURCE #-} Id ( Id )
import {-# SOURCE #-} TyCon ( TyCon )
import CStrings ( identToC, modnameToC, cSEP )
import CStrings ( identToC )
import CmdLineOpts ( opt_PprStyle_All, opt_OmitInterfacePragmas, opt_EnsureSplittableC )
import BasicTypes ( Module, IfaceFlavour(..), moduleString, pprModule )
import Lex ( isLexSym, isLexConId )
import Lex ( isLexConId )
import SrcLoc ( noSrcLoc, mkBuiltinSrcLoc, SrcLoc )
import Unique ( pprUnique, showUnique, Unique, Uniquable(..) )
import UniqSet ( UniqSet(..), emptyUniqSet, unitUniqSet, unionUniqSets, uniqSetToList,
......@@ -558,14 +558,12 @@ class NamedThing a where
\begin{code}
modAndOcc :: NamedThing a => a -> (Module, OccName)
getModule :: NamedThing a => a -> Module
getSrcLoc :: NamedThing a => a -> SrcLoc
isLocallyDefined :: NamedThing a => a -> Bool
isExported :: NamedThing a => a -> Bool
getOccString :: NamedThing a => a -> String
modAndOcc = nameModAndOcc . getName
getModule = nameModule . getName
isExported = isExportedName . getName
getSrcLoc = nameSrcLoc . getName
isLocallyDefined = isLocallyDefinedName . getName
......
......@@ -24,10 +24,12 @@ module UniqSupply (
import Unique
import Util
import GlaExts
import IOBase ( IO(..), IOResult(..) )
import PrelBase ( Char(..) )
#if __GLASGOW_HASKELL__ < 301
import IOBase ( IO(..), IOResult(..) )
#else
#endif
w2i x = word2Int# x
i2w x = int2Word# x
......
......@@ -638,7 +638,6 @@ errorIdKey = mkPreludeMiscIdUnique 7
foldlIdKey = mkPreludeMiscIdUnique 8
foldrIdKey = mkPreludeMiscIdUnique 9
forkIdKey = mkPreludeMiscIdUnique 10
int2IntegerIdKey = mkPreludeMiscIdUnique 11
integerMinusOneIdKey = mkPreludeMiscIdUnique 12
integerPlusOneIdKey = mkPreludeMiscIdUnique 13
integerPlusTwoIdKey = mkPreludeMiscIdUnique 14
......
......@@ -53,11 +53,11 @@ module CoreSyn (
#include "HsVersions.h"
import CostCentre ( showCostCentre, CostCentre )
import CostCentre ( CostCentre )
import Id ( idType, GenId{-instance Eq-}, Id )
import Type ( isUnboxedType,GenType, Type )
import TyVar ( GenTyVar, TyVar )
import Util ( panic, assertPanic {-pprTrace:ToDo:rm-} )
import Util ( panic, assertPanic )
import BinderInfo ( BinderInfo )
import BasicTypes ( Unused )
import Literal ( Literal )
......
......@@ -15,14 +15,14 @@ find, unsurprisingly, a Core expression.
\begin{code}
module CoreUnfold (
SimpleUnfolding(..), Unfolding(..), UnfoldingGuidance(..), -- types
UfExpr, RdrName, -- For closure (delete in 1.3)
FormSummary(..), mkFormSummary, whnfOrBottom, exprSmallEnoughToDup, exprIsTrivial,
FormSummary(..), mkFormSummary, whnfOrBottom, exprSmallEnoughToDup,
exprIsTrivial,
noUnfolding, mkMagicUnfolding, mkUnfolding, getUnfoldingTemplate,
smallEnoughToInline, couldBeSmallEnoughToInline, certainlySmallEnoughToInline,
inlineUnconditionally,
smallEnoughToInline, couldBeSmallEnoughToInline,
certainlySmallEnoughToInline, inlineUnconditionally,
calcUnfoldingGuidance,
......@@ -33,8 +33,6 @@ module CoreUnfold (
import {-# SOURCE #-} MagicUFs ( MagicUnfoldingFun, mkMagicUnfoldingFun )
import Bag ( emptyBag, unitBag, unionBags, Bag )
import CmdLineOpts ( opt_UnfoldingCreationThreshold,
opt_UnfoldingUseThreshold,
opt_UnfoldingConDiscount,
......@@ -49,23 +47,17 @@ import BinderInfo ( BinderInfo, isOneFunOcc, isOneSafeFunOcc
import PragmaInfo ( PragmaInfo(..) )
import CoreSyn
import CoreUtils ( unTagBinders )
import HsCore ( UfExpr )
import RdrHsSyn ( RdrName )
import OccurAnal ( occurAnalyseGlobalExpr )
import CoreUtils ( coreExprType )
import Id ( Id, idType, getIdArity, isBottomingId, isDataCon,
idWantsToBeINLINEd, idMustBeINLINEd, idMustNotBeINLINEd,
IdSet, GenId{-instances-} )
import PrimOp ( primOpCanTriggerGC, fragilePrimOp, PrimOp(..) )
import IdInfo ( ArityInfo(..), bottomIsGuaranteed )
import Literal ( isNoRepLit, isLitLitLit )
import PrimOp ( fragilePrimOp, primOpCanTriggerGC )
import IdInfo ( ArityInfo(..) )
import Literal ( isNoRepLit )
import TyCon ( tyConFamilySize )
import Type ( splitAlgTyConApp_maybe )
import Unique ( Unique )
import UniqSet ( emptyUniqSet, unitUniqSet, mkUniqSet,
addOneToUniqSet, unionUniqSets
)
import Maybes ( maybeToBool )
import Util ( isIn, panic, assertPanic )
import Outputable
\end{code}
......
......@@ -29,7 +29,7 @@ import Id ( idType, mkSysLocal, isBottomingId,
addOneToIdEnv, growIdEnvList, lookupIdEnv,
isNullIdEnv, IdEnv, Id
)
import Literal ( literalType, isNoRepLit, Literal(..) )
import Literal ( literalType, Literal(..) )
import Maybes ( catMaybes, maybeToBool )
import PprCore
import PrimOp ( primOpType, PrimOp(..) )
......@@ -46,7 +46,7 @@ import Type ( mkFunTy, mkForAllTy, mkTyVarTy,
import TysWiredIn ( trueDataCon, falseDataCon )
import Unique ( Unique )
import BasicTypes ( Unused )
import UniqSupply ( initUs, returnUs, thenUs,
import UniqSupply ( returnUs, thenUs,
mapUs, mapAndUnzipUs, getUnique,
UniqSM, UniqSupply
)
......
......@@ -17,13 +17,11 @@ module PprCore (
import CoreSyn
import CostCentre ( showCostCentre )
import Id ( idType, getIdInfo, getIdStrictness, isTupleCon,
nullIdEnv, DataCon, GenId{-instances-},
Id
import Id ( idType, getIdInfo, isTupleCon,
DataCon, GenId{-instances-}, Id
)
import IdInfo ( ppIdInfo, ppStrictnessInfo )
import Literal ( Literal{-instances-} )
import Name ( OccName )
import Outputable -- quite a few things
import PprEnv
import PprType ( pprParendGenType, pprTyVarBndr, GenType{-instances-}, GenTyVar{-instance-} )
......
......@@ -14,13 +14,12 @@ import {-# SOURCE #-} HsExpr ( pprExpr, HsExpr )
import {-# SOURCE #-} HsMatches ( pprMatches, Match, pprGRHSsAndBinds, GRHSsAndBinds )
-- friends:
import HsPragmas ( GenPragmas, ClassOpPragmas )
import HsTypes ( HsType )
import CoreSyn ( CoreExpr )
import PprCore () -- Instances for Outputable
--others:
import Id ( DictVar, Id, GenId )
import Id ( Id, GenId )
import Name ( OccName, NamedThing(..) )
import BasicTypes ( RecFlag(..) )
import Outputable
......
......@@ -21,9 +21,7 @@ module HsCore (
-- friends:
import HsTypes ( HsType, pprParendHsType )
import PrimOp ( PrimOp, tagOf_PrimOp )
import Kind ( Kind {- instance Outputable -} )
import Type ( GenType {- instance Outputable -} )
-- others:
import Literal ( Literal )
......
......@@ -13,9 +13,7 @@ module HsDecls where
-- friends:
import HsBinds ( HsBinds, MonoBinds, Sig, nullMonoBinds )
import HsPragmas ( DataPragmas, ClassPragmas,
InstancePragmas, ClassOpPragmas
)
import HsPragmas ( DataPragmas, ClassPragmas )
import HsTypes
import HsCore ( UfExpr )
import BasicTypes ( Fixity, NewOrData(..) )
......
......@@ -214,8 +214,6 @@ pprOutPat (DictPat dicts methods)
brackets (interpp'SP dicts),
brackets (interpp'SP methods)])
pprConPatTy ty
= parens (ppr ty)
\end{code}
%************************************************************************
......
......@@ -16,10 +16,6 @@ module HsPragmas where
#include "HsVersions.h"
-- friends:
import HsTypes ( HsType )
-- others:
import IdInfo
import Outputable
\end{code}
......@@ -60,179 +56,3 @@ instance Outputable name => Outputable (InstancePragmas name) where
instance Outputable name => Outputable (GenPragmas name) where
ppr NoGenPragmas = empty
\end{code}
========================= OLD CODE SCEDULED FOR DELETION SLPJ Nov 96 ==============
\begin{code}
{- COMMENTED OUT
Certain pragmas expect to be pinned onto certain constructs.
Pragma types may be parameterised, just as with any other
abstract-syntax type.
For a @data@ declaration---indicates which specialisations exist.
\begin{code}
data DataPragmas name
= NoDataPragmas
| DataPragmas [[Maybe (HsType name)]] -- types to which specialised
noDataPragmas = NoDataPragmas
isNoDataPragmas NoDataPragmas = True
\end{code}
These are {\em general} things you can know about any value:
\begin{code}
data GenPragmas name
= NoGenPragmas
| GenPragmas (Maybe Int) -- arity (maybe)
(Maybe UpdateInfo) -- update info (maybe)
(ImpStrictness name) -- strictness, worker-wrapper
(ImpUnfolding name) -- unfolding (maybe)
[([Maybe (HsType name)], -- Specialisations: types to which spec'd;
Int, -- # dicts to ignore
GenPragmas name)] -- Gen info about the spec'd version
noGenPragmas = NoGenPragmas
isNoGenPragmas NoGenPragmas = True
isNoGenPragmas _ = False
data ImpUnfolding name
= NoImpUnfolding
| ImpMagicUnfolding FAST_STRING -- magic "unfolding"
-- known to the compiler by "String"
| ImpUnfolding UnfoldingGuidance -- always, if you like, etc.
(UnfoldingCoreExpr name)
data ImpStrictness name
= NoImpStrictness
| ImpStrictness Bool -- True <=> bottoming Id
[Demand] -- demand info
(GenPragmas name) -- about the *worker*
\end{code}
For an ordinary imported function: it can have general pragmas (only).
For a class's super-class dictionary selectors:
\begin{code}
data ClassPragmas name
= NoClassPragmas
| SuperDictPragmas [GenPragmas name] -- list mustn't be empty
noClassPragmas = NoClassPragmas
isNoClassPragmas NoClassPragmas = True
isNoClassPragmas _ = False
\end{code}
For a class's method selectors:
\begin{code}
data ClassOpPragmas name
= NoClassOpPragmas
| ClassOpPragmas (GenPragmas name) -- for method selector
(GenPragmas name) -- for default method
noClassOpPragmas = NoClassOpPragmas
isNoClassOpPragmas NoClassOpPragmas = True
isNoClassOpPragmas _ = False
\end{code}
\begin{code}
data InstancePragmas name
= NoInstancePragmas
| SimpleInstancePragma -- nothing but for the dfun itself...
(GenPragmas name)
| ConstantInstancePragma
(GenPragmas name) -- for the "dfun" itself
[(name, GenPragmas name)] -- one per class op
| SpecialisedInstancePragma
(GenPragmas name) -- for its "dfun"
[([Maybe (HsType name)], -- specialised instance; type...
Int, -- #dicts to ignore
InstancePragmas name)] -- (no SpecialisedInstancePragma please!)
noInstancePragmas = NoInstancePragmas
isNoInstancePragmas NoInstancePragmas = True
isNoInstancePragmas _ = False
\end{code}
Some instances for printing (just for debugging, really)
\begin{code}
instance Outputable name => Outputable (ClassPragmas name) where
ppr NoClassPragmas = empty
ppr (SuperDictPragmas sdsel_prags)
= ($$) (ptext SLIT("{-superdict pragmas-}"))
(ppr sdsel_prags)
instance Outputable name => Outputable (ClassOpPragmas name) where
ppr NoClassOpPragmas = empty
ppr (ClassOpPragmas op_prags defm_prags)
= ($$) (hsep [ptext SLIT("{-meth-}"), ppr op_prags])
(hsep [ptext SLIT("{-defm-}"), ppr defm_prags])
instance Outputable name => Outputable (InstancePragmas name) where
ppr NoInstancePragmas = empty
ppr (SimpleInstancePragma dfun_pragmas)
= hsep [ptext SLIT("{-dfun-}"), ppr dfun_pragmas]
ppr (ConstantInstancePragma dfun_pragmas name_pragma_pairs)
= ($$) (hsep [ptext SLIT("{-constm-}"), ppr dfun_pragmas])
(vcat (map pp_pair name_pragma_pairs))
where
pp_pair (n, prags)
= hsep [ppr n, equals, ppr prags]
ppr (SpecialisedInstancePragma dfun_pragmas spec_pragma_info)
= ($$) (hsep [ptext SLIT("{-spec'd-}"), ppr dfun_pragmas])
(vcat (map pp_info spec_pragma_info))
where
pp_info (ty_maybes, num_dicts, prags)
= hcat [brackets (hsep (map pp_ty ty_maybes)),
parens (int num_dicts), equals, ppr prags]
pp_ty Nothing = ptext SLIT("_N_")
pp_ty (Just t)= ppr t
instance Outputable name => Outputable (GenPragmas name) where
ppr NoGenPragmas = empty
ppr (GenPragmas arity_maybe upd_maybe def strictness unfolding specs)
= hsep [pp_arity arity_maybe, pp_upd upd_maybe, -- ToDo: print def?
pp_str strictness, pp_unf unfolding,
pp_specs specs]
where
pp_arity Nothing = empty
pp_arity (Just i) = (<>) (ptext SLIT("ARITY=")) (int i)
pp_upd Nothing = empty
pp_upd (Just u) = ppUpdateInfo u
pp_str NoImpStrictness = empty
pp_str (ImpStrictness is_bot demands wrkr_prags)
= hcat [ptext SLIT("IS_BOT="), ppr is_bot,
ptext SLIT("STRICTNESS="), text (showList demands ""),
ptext SLIT(" {"), ppr wrkr_prags, char '}']
pp_unf NoImpUnfolding = ptext SLIT("NO_UNFOLDING")
pp_unf (ImpMagicUnfolding m) = (<>) (ptext SLIT("MAGIC=")) (ptext m)
pp_unf (ImpUnfolding g core) = (<>) (ptext SLIT("UNFOLD=")) (ppr core)
pp_specs [] = empty
pp_specs specs
= hcat [ptext SLIT("SPECS=["), hsep (map pp_spec specs), char ']']
where
pp_spec (ty_maybes, num_dicts, gprags)
= hsep [brackets (hsep (map pp_MaB ty_maybes)), int num_dicts, ppr gprags]
pp_MaB Nothing = ptext SLIT("_N_")
pp_MaB (Just x) = ppr x
\end{code}
\begin{code}
-}
\end{code}
......@@ -23,8 +23,7 @@ module HsTypes (
import Outputable
import Kind ( Kind {- instance Outputable -} )
import Name ( nameOccName )
import Util ( thenCmp, cmpList, isIn, panic )
import Util ( thenCmp, cmpList, panic )
import GlaExts ( Int#, (<#) )
\end{code}
......
......@@ -105,12 +105,17 @@ module CmdLineOpts (
import Array ( array, (//) )
import GlaExts
import ArrBase
import Argv
import Constants -- Default values for some flags
import Maybes ( assocMaybe, firstJust, maybeToBool )
import Util ( startsWith, panic, panic#, assertPanic )
import Util ( startsWith, panic, panic# )
#if __GLASGOW_HASKELL__ < 301
import ArrBase ( Array(..) )
#else
import PrelArr ( Array(..) )
#endif
\end{code}
A command-line {\em switch} is (generally) either on or off; e.g., the
......@@ -588,15 +593,6 @@ switchIsOn lookup_fn switch
SwBool False -> False
_ -> True
stringSwitchSet :: (switch -> SwitchResult)
-> (FAST_STRING -> switch)
-> Maybe FAST_STRING
stringSwitchSet lookup_fn switch
= case (lookup_fn (switch (panic "stringSwitchSet"))) of
SwString str -> Just str
_ -> Nothing
intSwitchSet :: (switch -> SwitchResult)
-> (Int -> switch)
-> Maybe Int
......
......@@ -12,8 +12,6 @@ module UgenUtil (
import GlaExts
import Name
import RdrHsSyn ( RdrName(..) )
import BasicTypes ( IfaceFlavour )
import SrcLoc ( mkSrcLoc, noSrcLoc, SrcLoc )
import FastString ( FastString, mkFastCharString, mkFastCharString2 )
\end{code}
......
......@@ -171,18 +171,6 @@ data_tycons
, voidTyCon
, wordTyCon
]
min_nonprim_tycon_list -- used w/ HideMostBuiltinNames
= [ boolTyCon
, charTyCon
, intTyCon
, floatTyCon
, doubleTyCon
, integerTyCon
, liftTyCon
, return2GMPsTyCon -- ADR asked for these last two (WDP 94/11)
, returnIntAndGMPTyCon
]
\end{code}
%************************************************************************
......
......@@ -8,9 +8,9 @@ module PrelVals where
#include "HsVersions.h"
import {-# SOURCE #-} CoreUnfold ( UnfoldingGuidance(..), mkUnfolding )
import {-# SOURCE #-} CoreUnfold ( mkUnfolding )
import Id ( Id, mkImported, mkTemplateLocals )
import Id ( Id, mkImported )
import SpecEnv ( SpecEnv, emptySpecEnv )
-- friends:
......