X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=141a513f4514d6031d4697e67ff82c91ca2a6cc8;hp=5ae7db8caacc319ce80c9846c287d18dfe50062e;hb=b2524b3960999fffdb3767900f58825903f6560f;hpb=8bbebfe661bdc976965718a2a489515c4929a03f diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 5ae7db8..141a513 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -15,23 +15,20 @@ module Debugger (pprintClosureCommand, showTerm, pprTypeAndContents) where import Linker import RtClosureInspect +import GhcMonad import HscTypes -import IdInfo ---import Id +import Id import Name import Var hiding ( varName ) import VarSet -import Name import UniqSupply import TcType import GHC -import DynFlags import InteractiveEval import Outputable -import SrcLoc import PprTyThing +import MonadUtils -import Control.Exception import Control.Monad import Data.List import Data.Maybe @@ -43,49 +40,55 @@ import GHC.Exts ------------------------------------- -- | The :print & friends commands ------------------------------------- -pprintClosureCommand :: Session -> Bool -> Bool -> String -> IO () -pprintClosureCommand session bindThings force str = do +pprintClosureCommand :: GhcMonad m => Bool -> Bool -> String -> m () +pprintClosureCommand bindThings force str = do tythings <- (catMaybes . concat) `liftM` - mapM (\w -> GHC.parseName session w >>= - mapM (GHC.lookupName session)) + mapM (\w -> GHC.parseName w >>= + mapM GHC.lookupName) (words str) let ids = [id | AnId id <- tythings] -- Obtain the terms and the recovered type information - (terms, substs) <- unzip `liftM` mapM (go session) ids - + (subst, terms) <- mapAccumLM go emptyTvSubst ids + -- Apply the substitutions obtained after recovering the types - modifySession session $ \hsc_env -> - hsc_env{hsc_IC = foldr (flip substInteractiveContext) - (hsc_IC hsc_env) - (map skolemiseSubst substs)} + modifySession $ \hsc_env -> + hsc_env{hsc_IC = substInteractiveContext (hsc_IC hsc_env) subst} + -- Finally, print the Terms - unqual <- GHC.getPrintUnqual session - docterms <- mapM (showTerm session) terms - (printForUser stdout unqual . vcat) - (zipWith (\id docterm -> ppr id <+> char '=' <+> docterm) - ids - docterms) + unqual <- GHC.getPrintUnqual + docterms <- mapM showTerm terms + liftIO $ (printForUser stdout unqual . vcat) + (zipWith (\id docterm -> ppr id <+> char '=' <+> docterm) + ids + docterms) where - -- Do the obtainTerm--bindSuspensions-computeSubstitution dance - go :: Session -> Id -> IO (Term, TvSubst) - 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 + go :: GhcMonad m => TvSubst -> Id -> m (TvSubst, Term) + go subst id = do + let id' = id `setIdType` substTy subst (idType id) + term_ <- GHC.obtainTermFromId maxBound force id' + term <- tidyTermTyVars term_ + term' <- if bindThings && + False == isUnliftedTypeKind (termType term) + then bindSuspensions 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 - subst = computeRTTIsubst (idType id) (reconstructed_type) - return (term',subst) - - tidyTermTyVars :: Session -> Term -> IO Term - tidyTermTyVars (Session ref) t = do - hsc_env <- readIORef ref - let env_tvs = ic_tyvars (hsc_IC hsc_env) + let reconstructed_type = termType term + hsc_env <- getSession + case (improveRTTIType hsc_env (idType id) (reconstructed_type)) of + Nothing -> return (subst, term') + Just subst' -> do { traceOptIf Opt_D_dump_rtti + (fsep $ [text "RTTI Improvement for", ppr id, + text "is the substitution:" , ppr subst']) + ; return (subst `unionTvSubst` subst', term')} + + tidyTermTyVars :: GhcMonad m => Term -> m Term + tidyTermTyVars t = + withSession $ \hsc_env -> do + let env_tvs = tyVarsOfTypes (map idType (ic_tmp_ids (hsc_IC hsc_env))) my_tvs = termTyVars t tvs = env_tvs `minusVarSet` my_tvs tyvarOccName = nameOccName . tyVarName @@ -95,24 +98,22 @@ pprintClosureCommand session bindThings force str = do -- | Give names, and bind in the interactive environment, to all the suspensions -- included (inductively) in a term -bindSuspensions :: Session -> Term -> IO Term -bindSuspensions cms@(Session ref) t = do - hsc_env <- readIORef ref - inScope <- GHC.getBindings cms +bindSuspensions :: GhcMonad m => Term -> m Term +bindSuspensions t = do + hsc_env <- getSession + inScope <- GHC.getBindings let ictxt = hsc_IC hsc_env prefix = "_t" alreadyUsedNames = map (occNameString . nameOccName . getName) inScope availNames = map ((prefix++) . show) [(1::Int)..] \\ alreadyUsedNames - availNames_var <- newIORef availNames - (t', stuff) <- foldTerm (nameSuspensionsAndGetInfos availNames_var) t + availNames_var <- liftIO $ newIORef availNames + (t', stuff) <- liftIO $ foldTerm (nameSuspensionsAndGetInfos availNames_var) t let (names, tys, hvals) = unzip3 stuff - let tys' = map (fst.skolemiseTy) tys - let ids = [ mkGlobalId VanillaGlobal name ty vanillaIdInfo - | (name,ty) <- zip names tys'] - new_tyvars = tyVarsOfTypes tys' - new_ic = extendInteractiveContext ictxt ids new_tyvars - extendLinkEnv (zip names hvals) - writeIORef ref (hsc_env {hsc_IC = new_ic }) + let ids = [ mkVanillaGlobal name ty + | (name,ty) <- zip names tys] + new_ic = extendInteractiveContext ictxt ids + liftIO $ extendLinkEnv (zip names hvals) + modifySession $ \_ -> hsc_env {hsc_IC = new_ic } return t' where @@ -131,18 +132,20 @@ bindSuspensions cms@(Session ref) t = do \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 _name = do + doSuspension freeNames ct ty hval _name = do name <- atomicModifyIORef freeNames (\x->(tail x, head x)) n <- newGrimName name - let ty' = fromMaybe (error "unexpected") mb_ty - return (Suspension ct mb_ty hval (Just n), [(n,ty',hval)]) + return (Suspension ct ty hval (Just n), [(n,ty,hval)]) -- A custom Term printer to enable the use of Show instances -showTerm :: Session -> Term -> IO SDoc -showTerm cms@(Session ref) term = do - dflags <- GHC.getSessionDynFlags cms +showTerm :: GhcMonad m => Term -> m SDoc +showTerm term = do + dflags <- GHC.getSessionDynFlags if dopt Opt_PrintEvldWithShow dflags then cPprTerm (liftM2 (++) (\_y->[cPprShowable]) cPprTermBase) term else cPprTerm cPprTermBase term @@ -151,29 +154,32 @@ showTerm cms@(Session ref) term = do if not (isFullyEvaluatedTerm t) then return Nothing else do - hsc_env <- readIORef ref - dflags <- GHC.getSessionDynFlags cms + hsc_env <- getSession + dflags <- GHC.getSessionDynFlags do (new_env, bname) <- bindToFreshName hsc_env ty "showme" - writeIORef ref (new_env) + setSession new_env + -- XXX: this tries to disable logging of errors + -- does this still do what it is intended to do + -- with the changed error handling and logging? let noop_log _ _ _ _ = return () expr = "show " ++ showSDoc (ppr bname) - GHC.setSessionDynFlags cms dflags{log_action=noop_log} - mb_txt <- withExtendedLinkEnv [(bname, val)] - (GHC.compileExpr cms expr) + _ <- GHC.setSessionDynFlags dflags{log_action=noop_log} + txt_ <- withExtendedLinkEnv [(bname, val)] + (GHC.compileExpr expr) let myprec = 10 -- application precedence. TODO Infix constructors - case mb_txt of - Just txt_ | txt <- unsafeCoerce# txt_, not (null txt) - -> return $ Just$ cparen (prec >= myprec && - needsParens txt) - (text txt) - _ -> return Nothing - `finally` do - writeIORef ref hsc_env - GHC.setSessionDynFlags cms dflags + let txt = unsafeCoerce# txt_ + if not (null txt) then + return $ Just$ cparen (prec >= myprec && + needsParens txt) + (text txt) + else return Nothing + `gfinally` do + setSession hsc_env + GHC.setSessionDynFlags dflags cPprShowable prec NewtypeWrap{ty=new_ty,wrapped_term=t} = cPprShowable prec t{ty=new_ty} - cPprShowable _ _ = panic "cPprShowable - unreachable" + cPprShowable _ _ = return Nothing needsParens ('"':_) = False -- some simple heuristics to see whether parens -- are redundant in an arbitrary Show output @@ -185,30 +191,38 @@ showTerm cms@(Session ref) term = do name <- newGrimName userName let ictxt = hsc_IC hsc_env tmp_ids = ic_tmp_ids ictxt - id = mkGlobalId VanillaGlobal name (sigmaType ty) vanillaIdInfo + id = mkVanillaGlobal name ty new_ic = ictxt { ic_tmp_ids = id : tmp_ids } return (hsc_env {hsc_IC = new_ic }, name) -- Create new uniques and give them sequentially numbered names -newGrimName :: String -> IO Name +newGrimName :: MonadIO m => String -> m Name newGrimName userName = do - us <- mkSplitUniqSupply 'b' + us <- liftIO $ 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 +pprTypeAndContents :: GhcMonad m => [Id] -> m SDoc +pprTypeAndContents ids = do + dflags <- GHC.getSessionDynFlags 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 + terms <- mapM (GHC.obtainTermFromId depthBound False) ids + docs_terms <- mapM showTerm terms return $ vcat $ zipWith (\ty cts -> ty <+> equals <+> cts) (map (pprTyThing pefas . AnId) ids) docs_terms else return $ vcat $ map (pprTyThing pefas . AnId) ids + +-------------------------------------------------------------- +-- Utils + +traceOptIf :: GhcMonad m => DynFlag -> SDoc -> m () +traceOptIf flag doc = do + dflags <- GHC.getSessionDynFlags + when (dopt flag dflags) $ liftIO $ printForUser stderr alwaysQualify doc