summaryrefslogtreecommitdiff
path: root/compiler/typecheck
diff options
context:
space:
mode:
authorLennart Kolmodin <kolmodin@gmail.com>2014-11-20 23:28:34 -0600
committerAustin Seipp <austin@well-typed.com>2014-11-20 23:32:16 -0600
commit417809baaf7d1fc6a7c708fa195ace277059c3d3 (patch)
tree850eca2017a80024cbe41115590aa0c955bffceb /compiler/typecheck
parentc6322eebea61dd29d0dab698cb89334596851b9d (diff)
downloadhaskell-wip/merge.tar.gz
ghc allow --show-options and --interactive togetherwip/merge
Summary: Previously --show-options showed all options that GHC accepts. Now, it'll only show the options that have effect in non-interactive modes. This change also adds support for using --interactive together with --show-options, making it show all options that have effect in the interactive mode. The CmdLineParser is updated to know about ghc modes, and then each flag is annotated with which mode it has effect. This fixes #9259. Test Plan: Try out --show-options with --interactive on the command line. With and without --interactive should give different results. Reviewers: austin Reviewed By: austin Subscribers: jstolarek, thomie, carter, simonmar Differential Revision: https://phabricator.haskell.org/D337 GHC Trac Issues: #9259 Conflicts: compiler/main/DynFlags.hs
Diffstat (limited to 'compiler/typecheck')
-rw-r--r--compiler/typecheck/TcDeriv.lhs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/typecheck/TcDeriv.lhs b/compiler/typecheck/TcDeriv.lhs
index aac4a7b94e..786cea9277 100644
--- a/compiler/typecheck/TcDeriv.lhs
+++ b/compiler/typecheck/TcDeriv.lhs
@@ -1438,7 +1438,7 @@ checkFlag flag (dflags, _, _)
where
why = ptext (sLit "You need ") <> text flag_str
<+> ptext (sLit "to derive an instance for this class")
- flag_str = case [ s | (s, f, _) <- xFlags, f==flag ] of
+ flag_str = case [ flagSpecName f | f <- xFlags , flagSpecFlag f == flag ] of
[s] -> s
other -> pprPanic "checkFlag" (ppr other)