From: sof Date: Mon, 26 May 1997 05:00:35 +0000 (+0000) Subject: [project @ 1997-05-26 05:00:06 by sof] X-Git-Tag: Approximately_1000_patches_recorded~473 X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=9fd7b8ed911b9bbb290663772d2940f99e8277b5;p=ghc-hetmet.git [project @ 1997-05-26 05:00:06 by sof] Updated imports --- diff --git a/ghc/compiler/basicTypes/IdLoop.lhi b/ghc/compiler/basicTypes/IdLoop.lhi index 4d2fdf5..e22065b 100644 --- a/ghc/compiler/basicTypes/IdLoop.lhi +++ b/ghc/compiler/basicTypes/IdLoop.lhi @@ -13,7 +13,7 @@ import CoreUnfold ( Unfolding(..), UnfoldingGuidance(..), mkUnfolding, SimpleUnfolding(..), FormSummary(..), noUnfolding ) import CoreUtils ( unTagBinders ) import Id ( externallyVisibleId, isDataCon, isWorkerId, isWrapperId, - unfoldingUnfriendlyId, getIdInfo, nmbrId, + unfoldingUnfriendlyId, getIdInfo, nmbrId, pprId, nullIdEnv, lookupIdEnv, IdEnv(..), Id(..), GenId ) @@ -29,9 +29,8 @@ import SpecEnv ( SpecEnv, nullSpecEnv, isNullSpecEnv ) import Literal ( Literal ) import MagicUFs ( mkMagicUnfoldingFun, MagicUnfoldingFun ) import OccurAnal ( occurAnalyseGlobalExpr ) -import Outputable ( Outputable(..) ) +import Outputable ( Outputable(..), PprStyle ) import PprEnv ( NmbrEnv ) -import PprStyle ( PprStyle ) import PprType ( pprParendGenType ) import PragmaInfo ( PragmaInfo ) import Pretty ( Doc ) @@ -56,6 +55,7 @@ externallyVisibleId :: Id -> Bool isDataCon :: GenId ty -> Bool isWorkerId :: GenId ty -> Bool nmbrId :: Id -> NmbrEnv -> (NmbrEnv, Id) +pprId :: Outputable ty => PprStyle -> GenId ty -> Doc mkMagicUnfoldingFun :: Unique -> MagicUnfoldingFun diff --git a/ghc/compiler/basicTypes/Literal.lhs b/ghc/compiler/basicTypes/Literal.lhs index cf9909e..738dcf1 100644 --- a/ghc/compiler/basicTypes/Literal.lhs +++ b/ghc/compiler/basicTypes/Literal.lhs @@ -28,11 +28,10 @@ import TysPrim ( getPrimRepInfo, import CStrings ( stringToC, charToC, charToEasyHaskell ) import TysWiredIn ( stringTy ) import Pretty -- pretty-printing stuff -import PprStyle ( PprStyle(..), codeStyle, ifaceStyle ) -import Util --( thenCmp, panic, pprPanic ) +import Outputable ( PprStyle(..), codeStyle, ifaceStyle, Outputable(..) ) +import Util ( thenCmp, panic, pprPanic, Ord3(..) ) #if __GLASGOW_HASKELL__ >= 202 import Type -import Outputable #endif \end{code}