[commit: ghc] master: Fix weird behavior of -ignore-dot-ghci and -ghci-scipt (f5188f3)

git at git.haskell.org git at git.haskell.org
Tue May 12 13:56:18 UTC 2015


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f5188f3acd73a07b648924a58b9882c2d0a3dbcb/ghc

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

commit f5188f3acd73a07b648924a58b9882c2d0a3dbcb
Author: Zejun Wu <watashi at watashi.ws>
Date:   Tue May 12 08:56:12 2015 -0500

    Fix weird behavior of -ignore-dot-ghci and -ghci-scipt
    
     * Make `-ghci-script` be executed in the order they are specified;
     * Make `-ignore-dot-ghci` only ignores the default .ghci files but
       still execute the scripts passed by `-ghci-script`.
    
    Reviewed By: simonmar, austin
    
    Differential Revision: https://phabricator.haskell.org/D887
    
    GHC Trac Issues: #10408


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

f5188f3acd73a07b648924a58b9882c2d0a3dbcb
 compiler/main/DynFlags.hs                   |  2 +
 ghc/InteractiveUI.hs                        | 80 ++++++++++++++---------------
 testsuite/tests/ghci/scripts/Makefile       | 10 ++++
 testsuite/tests/ghci/scripts/T10408A.script |  1 +
 testsuite/tests/ghci/scripts/T10408A.stdout |  2 +
 testsuite/tests/ghci/scripts/T10408B.script |  1 +
 testsuite/tests/ghci/scripts/T10408B.stdout |  2 +
 testsuite/tests/ghci/scripts/all.T          |  5 ++
 8 files changed, 63 insertions(+), 40 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 f5188f3acd73a07b648924a58b9882c2d0a3dbcb


More information about the ghc-commits mailing list