projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle breakpoint jumps while splicing TH functions in ghci
[ghc-hetmet.git]
/
compiler
/
main
/
DynFlags.hs
diff --git
a/compiler/main/DynFlags.hs
b/compiler/main/DynFlags.hs
index
fc3f434
..
a176a73
100644
(file)
--- a/
compiler/main/DynFlags.hs
+++ b/
compiler/main/DynFlags.hs
@@
-84,6
+84,9
@@
import Util ( split )
import Data.Char ( isDigit, isUpper )
import System.IO ( hPutStrLn, stderr )
import Data.Char ( isDigit, isUpper )
import System.IO ( hPutStrLn, stderr )
+import Breakpoints ( BkptHandler )
+import Module ( ModuleName )
+
-- -----------------------------------------------------------------------------
-- DynFlags
-- -----------------------------------------------------------------------------
-- DynFlags
@@
-197,10
+200,9
@@
data DynFlag
| Opt_SplitObjs
| Opt_StgStats
| Opt_HideAllPackages
| Opt_SplitObjs
| Opt_StgStats
| Opt_HideAllPackages
+ | Opt_Debugging
| Opt_PrintBindResult
| Opt_Haddock
| Opt_PrintBindResult
| Opt_Haddock
- | Opt_Hpc
- | Opt_Hpc_Trace
-- keeping stuff
| Opt_KeepHiDiffs
-- keeping stuff
| Opt_KeepHiDiffs
@@
-305,6
+307,9
@@
data DynFlags = DynFlags {
-- message output
log_action :: Severity -> SrcSpan -> PprStyle -> Message -> IO ()
-- message output
log_action :: Severity -> SrcSpan -> PprStyle -> Message -> IO ()
+
+ -- breakpoint handling
+ ,bkptHandler :: Maybe (BkptHandler Module)
}
data HscTarget
}
data HscTarget
@@
-413,7
+418,8
@@
defaultDynFlags =
packageFlags = [],
pkgDatabase = Nothing,
pkgState = panic "no package state yet: call GHC.setSessionDynFlags",
packageFlags = [],
pkgDatabase = Nothing,
pkgState = panic "no package state yet: call GHC.setSessionDynFlags",
-
+
+ bkptHandler = Nothing,
flags = [
Opt_ReadUserPackageConf,
flags = [
Opt_ReadUserPackageConf,
@@
-540,9
+546,7
@@
data Option
updOptLevel :: Int -> DynFlags -> DynFlags
-- Set dynflags appropriate to the optimisation level
updOptLevel n dfs
updOptLevel :: Int -> DynFlags -> DynFlags
-- Set dynflags appropriate to the optimisation level
updOptLevel n dfs
- = if (n >= 1)
- then dfs2{ hscTarget = HscC, optLevel = n } -- turn on -fvia-C with -O
- else dfs2{ optLevel = n }
+ = dfs2{ optLevel = n }
where
dfs1 = foldr (flip dopt_unset) dfs remove_dopts
dfs2 = foldr (flip dopt_set) dfs1 extra_dopts
where
dfs1 = foldr (flip dopt_unset) dfs remove_dopts
dfs2 = foldr (flip dopt_set) dfs1 extra_dopts
@@
-1053,7
+1057,7
@@
fFlags = [
( "print-bind-result", Opt_PrintBindResult ),
( "force-recomp", Opt_ForceRecomp ),
( "hpc", Opt_Hpc ),
( "print-bind-result", Opt_PrintBindResult ),
( "force-recomp", Opt_ForceRecomp ),
( "hpc", Opt_Hpc ),
- ( "hpc-tracer", Opt_Hpc )
+ ( "hpc-tracer", Opt_Hpc_Tracer )
]
]