diff options
Diffstat (limited to 'compiler/ghci')
| -rw-r--r-- | compiler/ghci/Debugger.hs | 8 | ||||
| -rw-r--r-- | compiler/ghci/Linker.lhs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/compiler/ghci/Debugger.hs b/compiler/ghci/Debugger.hs index 9d10711dbc..55c18dec1e 100644 --- a/compiler/ghci/Debugger.hs +++ b/compiler/ghci/Debugger.hs @@ -147,7 +147,7 @@ bindSuspensions t = do showTerm :: GhcMonad m => Term -> m SDoc showTerm term = do dflags <- GHC.getSessionDynFlags - if dopt Opt_PrintEvldWithShow dflags + if gopt Opt_PrintEvldWithShow dflags then cPprTerm (liftM2 (++) (\_y->[cPprShowable]) cPprTermBase) term else cPprTerm cPprTermBase term where @@ -205,8 +205,8 @@ newGrimName userName = do pprTypeAndContents :: GhcMonad m => Id -> m SDoc pprTypeAndContents id = do dflags <- GHC.getSessionDynFlags - let pefas = dopt Opt_PrintExplicitForalls dflags - pcontents = dopt Opt_PrintBindContents dflags + let pefas = gopt Opt_PrintExplicitForalls dflags + pcontents = gopt Opt_PrintBindContents dflags pprdId = (pprTyThing pefas . AnId) id if pcontents then do @@ -227,4 +227,4 @@ pprTypeAndContents id = do traceOptIf :: GhcMonad m => GeneralFlag -> SDoc -> m () traceOptIf flag doc = do dflags <- GHC.getSessionDynFlags - when (dopt flag dflags) $ liftIO $ printInfoForUser dflags alwaysQualify doc + when (gopt flag dflags) $ liftIO $ printInfoForUser dflags alwaysQualify doc diff --git a/compiler/ghci/Linker.lhs b/compiler/ghci/Linker.lhs index f4a5ca5050..c3d5274120 100644 --- a/compiler/ghci/Linker.lhs +++ b/compiler/ghci/Linker.lhs @@ -814,7 +814,7 @@ dynLoadObjs dflags objs = do let -- When running TH for a non-dynamic way, we still need to make -- -l flags to link against the dynamic libraries, so we turn -- Opt_Static off - dflags1 = dopt_unset dflags Opt_Static + dflags1 = gopt_unset dflags Opt_Static dflags2 = dflags1 { -- We don't want to link the ldInputs in; we'll -- be calling dynLoadObjs with any objects that |