X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fghci%2FDebugger.hs;h=d31d4d67d157d8428bdd2c713fad02d5b0fce26e;hb=cf2ee54939510b1a64ad99ca7d00aeb8a862c06b;hp=0b75dd0dc267e2f961138c8f29d8fdf02c562bb5;hpb=98e1486635c889e023097d63da0c9b68393de1fd;p=ghc-hetmet.git diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 0b75dd0..d31d4d6 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -21,18 +21,14 @@ 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 DynFlags import InteractiveEval import Outputable import Pretty ( Mode(..), showDocWith ) -import FastString import SrcLoc import Control.Exception @@ -44,14 +40,13 @@ import Data.IORef import System.IO import GHC.Exts -#include "HsVersions.h" ------------------------------------- -- | The :print & friends commands ------------------------------------- pprintClosureCommand :: Session -> Bool -> Bool -> String -> IO () -pprintClosureCommand session bindThings force str = do +pprintClosureCommand session bindThings force str = do tythings <- (catMaybes . concat) `liftM` - mapM (\w -> GHC.parseName session w >>= + mapM (\w -> GHC.parseName session w >>= mapM (GHC.lookupName session)) (words str) let ids = [id | AnId id <- tythings] @@ -95,7 +90,7 @@ pprintClosureCommand session bindThings force str = do let env_tvs = ic_tyvars (hsc_IC hsc_env) my_tvs = termTyVars t tvs = env_tvs `minusVarSet` my_tvs - tyvarOccName = nameOccName . tyVarName + tyvarOccName = nameOccName . tyVarName tidyEnv = (initTidyOccEnv (map tyvarOccName (varSetElems tvs)) , env_tvs `intersectVarSet` my_tvs) return$ mapTermType (snd . tidyOpenType tidyEnv) t @@ -103,13 +98,13 @@ 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 +bindSuspensions cms@(Session ref) t = do hsc_env <- readIORef ref inScope <- GHC.getBindings cms 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 @@ -124,62 +119,72 @@ bindSuspensions cms@(Session ref) t = do where -- Processing suspensions. Give names and recopilate info - nameSuspensionsAndGetInfos :: IORef [String] -> + nameSuspensionsAndGetInfos :: IORef [String] -> TermFold (IO (Term, [(Name,Type,HValue)])) - nameSuspensionsAndGetInfos freeNames = TermFold + nameSuspensionsAndGetInfos freeNames = TermFold { fSuspension = doSuspension freeNames - , fTerm = \ty dc v tt -> do - tt' <- sequence tt - let (terms,names) = unzip tt' + , fTerm = \ty dc v tt -> do + tt' <- sequence tt + 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) } - doSuspension freeNames ct mb_ty hval Nothing = do + doSuspension freeNames ct mb_ty hval _name = do name <- atomicModifyIORef freeNames (\x->(tail x, head x)) - n <- newGrimName cms name + n <- newGrimName name let ty' = fromMaybe (error "unexpected") mb_ty return (Suspension ct mb_ty hval (Just n), [(n,ty',hval)]) -- A custom Term printer to enable the use of Show instances -printTerm 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} = do - let hasType = isEmptyVarSet (tyVarsOfType ty) -- redundant - isEvaled = isFullyEvaluatedTerm t - if not isEvaled -- || not hasType + cPprShowable prec t@Term{ty=ty, val=val} = + if not (isFullyEvaluatedTerm t) then return Nothing - else do + else do hsc_env <- readIORef ref dflags <- GHC.getSessionDynFlags cms do (new_env, bname) <- bindToFreshName hsc_env ty "showme" writeIORef ref (new_env) - let noop_log _ _ _ _ = return () + let noop_log _ _ _ _ = return () expr = "show " ++ showSDoc (ppr bname) GHC.setSessionDynFlags cms dflags{log_action=noop_log} - mb_txt <- withExtendedLinkEnv [(bname, val)] + mb_txt <- withExtendedLinkEnv [(bname, val)] (GHC.compileExpr cms 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) + 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 + `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 _ _ = panic "cPprShowable - unreachable" + + 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,8 +192,8 @@ printTerm 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