X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=c0ac9d3166307295d4ba0c03795216d1e25710c7;hb=e314b86f6290e5440a46cd5cc29f7878cb78c6fb;hp=b69078ff08be821ce95740fc06661b4ac36fab20;hpb=17b297d97d327620ed6bfab942f8992b2446f1bf;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index b69078f..c0ac9d3 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -10,14 +10,7 @@ -- ----------------------------------------------------------------------------- -{-# OPTIONS_GHC -w #-} --- The above warning supression flag is a temporary kludge. --- While working on this module you are encouraged to remove it and fix --- any warnings in the module. See --- http://hackage.haskell.org/trac/ghc/wiki/WorkingConventions#Warnings --- for details - -module Debugger (pprintClosureCommand, showTerm) where +module Debugger (pprintClosureCommand, showTerm, pprTypeAndContents) where import Linker import RtClosureInspect @@ -32,10 +25,11 @@ import Name import UniqSupply import TcType import GHC +import DynFlags import InteractiveEval import Outputable -import Pretty ( Mode(..), showDocWith ) import SrcLoc +import PprTyThing import Control.Exception import Control.Monad @@ -46,7 +40,6 @@ import Data.IORef import System.IO import GHC.Exts -#include "HsVersions.h" ------------------------------------- -- | The :print & friends commands ------------------------------------- @@ -68,10 +61,8 @@ pprintClosureCommand session bindThings force str = do (map skolemiseSubst substs)} -- Finally, print the Terms unqual <- GHC.getPrintUnqual session - let showSDocForUserOneLine unqual doc = - showDocWith LeftMode (doc (mkErrStyle unqual)) docterms <- mapM (showTerm session) terms - (putStrLn . showSDocForUserOneLine unqual . vcat) + (printForUser stdout unqual . vcat) (zipWith (\id docterm -> ppr id <+> char '=' <+> docterm) ids docterms) @@ -82,14 +73,17 @@ pprintClosureCommand session bindThings force str = do go cms id = do term_ <- GHC.obtainTerm cms force id term <- tidyTermTyVars cms term_ - term' <- if not bindThings then return term - else bindSuspensions cms term + term' <- if bindThings && + False == isUnliftedTypeKind (termType term) + then bindSuspensions cms term + else return term -- Before leaving, we compare the type obtained to see if it's more specific -- Then, we extract a substitution, -- mapping the old tyvars to the reconstructed types. - let Just reconstructed_type = termType term - Just subst = computeRTTIsubst (idType id) (reconstructed_type) - return (term',subst) + let reconstructed_type = termType term + mb_subst <- withSession cms $ \hsc_env -> + improveRTTIType hsc_env (idType id) (reconstructed_type) + return (term', fromMaybe emptyTvSubst mb_subst) tidyTermTyVars :: Session -> Term -> IO Term tidyTermTyVars (Session ref) t = do @@ -111,7 +105,7 @@ bindSuspensions cms@(Session ref) t = do let ictxt = hsc_IC hsc_env prefix = "_t" alreadyUsedNames = map (occNameString . nameOccName . getName) inScope - availNames = map ((prefix++) . show) [1..] \\ alreadyUsedNames + availNames = map ((prefix++) . show) [(1::Int)..] \\ alreadyUsedNames availNames_var <- newIORef availNames (t', stuff) <- foldTerm (nameSuspensionsAndGetInfos availNames_var) t let (names, tys, hvals) = unzip3 stuff @@ -136,19 +130,29 @@ bindSuspensions cms@(Session ref) t = do let (terms,names) = unzip tt' return (Term ty dc v terms, concat names) , fPrim = \ty n ->return (Prim ty n,[]) + , fNewtypeWrap = + \ty dc t -> do + (term, names) <- t + return (NewtypeWrap ty dc term, names) + , fRefWrap = \ty t -> do + (term, names) <- t + return (RefWrap ty term, names) } - doSuspension freeNames ct mb_ty hval Nothing = do + doSuspension freeNames ct ty hval _name = do name <- atomicModifyIORef freeNames (\x->(tail x, head x)) - n <- newGrimName cms name - let ty' = fromMaybe (error "unexpected") mb_ty - return (Suspension ct mb_ty hval (Just n), [(n,ty',hval)]) + n <- newGrimName name + return (Suspension ct ty hval (Just n), [(n,ty,hval)]) -- A custom Term printer to enable the use of Show instances -showTerm cms@(Session ref) = cPprTerm cPpr +showTerm :: Session -> Term -> IO SDoc +showTerm cms@(Session ref) term = do + dflags <- GHC.getSessionDynFlags cms + if dopt Opt_PrintEvldWithShow dflags + then cPprTerm (liftM2 (++) (\_y->[cPprShowable]) cPprTermBase) term + else cPprTerm cPprTermBase term where - cPpr = \p-> cPprShowable : cPprTermBase p - cPprShowable prec t@Term{ty=ty, dc=dc, val=val} = + cPprShowable prec t@Term{ty=ty, val=val} = if not (isFullyEvaluatedTerm t) then return Nothing else do @@ -172,14 +176,18 @@ showTerm cms@(Session ref) = cPprTerm cPpr `finally` do writeIORef ref hsc_env GHC.setSessionDynFlags cms dflags - needsParens ('"':txt) = False -- some simple heuristics to see whether parens + cPprShowable prec NewtypeWrap{ty=new_ty,wrapped_term=t} = + cPprShowable prec t{ty=new_ty} + cPprShowable _ _ = return Nothing + + needsParens ('"':_) = False -- some simple heuristics to see whether parens -- are redundant in an arbitrary Show output - needsParens ('(':txt) = False + needsParens ('(':_) = False needsParens txt = ' ' `elem` txt bindToFreshName hsc_env ty userName = do - name <- newGrimName cms userName + name <- newGrimName userName let ictxt = hsc_IC hsc_env tmp_ids = ic_tmp_ids ictxt id = mkGlobalId VanillaGlobal name (sigmaType ty) vanillaIdInfo @@ -187,10 +195,25 @@ showTerm cms@(Session ref) = cPprTerm cPpr return (hsc_env {hsc_IC = new_ic }, name) -- Create new uniques and give them sequentially numbered names --- newGrimName :: Session -> String -> IO Name -newGrimName cms userName = do +newGrimName :: String -> IO Name +newGrimName userName = do us <- mkSplitUniqSupply 'b' let unique = uniqFromSupply us occname = mkOccName varName userName name = mkInternalName unique occname noSrcSpan return name + +pprTypeAndContents :: Session -> [Id] -> IO SDoc +pprTypeAndContents session ids = do + dflags <- GHC.getSessionDynFlags session + let pefas = dopt Opt_PrintExplicitForalls dflags + pcontents = dopt Opt_PrintBindContents dflags + if pcontents + then do + let depthBound = 100 + terms <- mapM (GHC.obtainTermB session depthBound False) ids + docs_terms <- mapM (showTerm session) terms + return $ vcat $ zipWith (\ty cts -> ty <+> equals <+> cts) + (map (pprTyThing pefas . AnId) ids) + docs_terms + else return $ vcat $ map (pprTyThing pefas . AnId) ids