[commit: ghc] wip/merge: ghc allow --show-options and --interactive together (417809b)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/merge
Link       : http://ghc.haskell.org/trac/ghc/changeset/417809baaf7d1fc6a7c708fa195ace277059c3d3/ghc

>---------------------------------------------------------------

commit 417809baaf7d1fc6a7c708fa195ace277059c3d3
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Thu Nov 20 23:28:34 2014 -0600

    ghc allow --show-options and --interactive together
    
    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


>---------------------------------------------------------------

417809baaf7d1fc6a7c708fa195ace277059c3d3
 compiler/main/CmdLineParser.hs  |   28 +-
 compiler/main/DynFlags.hs       | 1186 ++++++++++++++++++++-------------------
 compiler/main/StaticFlags.hs    |    8 +-
 compiler/typecheck/TcDeriv.lhs  |    2 +-
 ghc/InteractiveUI.hs            |   22 +-
 ghc/Main.hs                     |   89 +--
 testsuite/tests/driver/T4437.hs |    2 +-
 7 files changed, 706 insertions(+), 631 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 417809baaf7d1fc6a7c708fa195ace277059c3d3