From: Pepe Iborra Date: Wed, 29 Aug 2007 16:56:53 +0000 (+0000) Subject: Warning police X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=0ffb4bedd21e52dd5d04d710aade581e2fc9b6a1 Warning police --- diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 602a1a5..db9bce1 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -21,18 +21,13 @@ import IdInfo import Name import Var hiding ( varName ) import VarSet -import VarEnv import Name import UniqSupply -import Type import TcType -import TcGadt import GHC -import GhciMonad import InteractiveEval import Outputable import Pretty ( Mode(..), showDocWith ) -import FastString import SrcLoc import Control.Exception @@ -146,10 +141,8 @@ bindSuspensions cms@(Session ref) t = do showTerm cms@(Session ref) = cPprTerm cPpr where cPpr = \p-> cPprShowable : cPprTermBase p - cPprShowable prec t@Term{ty=ty, dc=dc, val=val} = do - let hasType = isEmptyVarSet (tyVarsOfType ty) -- redundant - isEvaled = isFullyEvaluatedTerm t - if not isEvaled -- || not hasType + cPprShowable prec t@Term{ty=ty, dc=dc, val=val} = + if not (isFullyEvaluatedTerm t) then return Nothing else do hsc_env <- readIORef ref diff --git a/compiler/ghci/RtClosureInspect.hs b/compiler/ghci/RtClosureInspect.hs index cafa527..e68bf88 100644 --- a/compiler/ghci/RtClosureInspect.hs +++ b/compiler/ghci/RtClosureInspect.hs @@ -11,6 +11,9 @@ module RtClosureInspect( cvObtainTerm, -- :: HscEnv -> Int -> Bool -> Maybe Type -> HValue -> IO Term Term(..), + isTerm, + isSuspension, + isPrim, pprTerm, cPprTerm, cPprTermBase, @@ -27,7 +30,12 @@ module RtClosureInspect( -- unsafeDeepSeq, cvReconstructType, computeRTTIsubst, - sigmaType + sigmaType, + Closure(..), + getClosureData, + ClosureType(..), + isConstr, + isIndirection ) where #include "HsVersions.h" @@ -39,7 +47,7 @@ import Linker import DataCon import Type -import TcRnMonad ( TcM, initTc, initTcPrintErrors, ioToTcRn, +import TcRnMonad ( TcM, initTc, ioToTcRn, tryTcErrs) import TcType import TcMType @@ -69,7 +77,6 @@ import Control.Monad import Data.Maybe import Data.Array.Base import Data.List ( partition ) -import qualified Data.Sequence as Seq import Foreign import System.IO.Unsafe