[commit: ghc] wip/nfs-locking: Merge Predicate into Expression (2bdb94f)

[git at git.haskell.org]

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

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/2bdb94fda55a4a4b34c8ae1403e3ec07bd7b653c/ghc

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

commit 2bdb94fda55a4a4b34c8ae1403e3ec07bd7b653c
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Aug 6 22:27:23 2017 +0100

    Merge Predicate into Expression


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

2bdb94fda55a4a4b34c8ae1403e3ec07bd7b653c
 hadrian.cabal                        |  1 -
 src/Builder.hs                       | 85 +++++++++++++++++++++++---------
 src/Context.hs                       | 24 ++++++++--
 src/Expression.hs                    | 76 +++++++++++++++++++++++------
 src/Oracles/Dependencies.hs          |  2 +-
 src/Predicate.hs                     | 93 ------------------------------------
 src/Rules/Cabal.hs                   |  2 +-
 src/Rules/Documentation.hs           |  2 +-
 src/Rules/Generate.hs                |  1 -
 src/Rules/Install.hs                 |  2 +-
 src/Rules/Library.hs                 |  2 +-
 src/Rules/Program.hs                 |  2 +-
 src/Settings/Builders/Common.hs      |  2 -
 src/Settings/Default.hs              |  2 +-
 src/Settings/Default.hs-boot         |  2 +-
 src/Settings/Flavours/Development.hs |  2 +-
 src/Settings/Flavours/Performance.hs |  2 +-
 src/Settings/Flavours/Profiled.hs    |  2 +-
 src/Settings/Flavours/Quick.hs       |  2 +-
 src/Settings/Flavours/Quickest.hs    |  2 +-
 src/Settings/Packages/Base.hs        |  2 +-
 src/Settings/Packages/Cabal.hs       |  2 +-
 src/Settings/Packages/Compiler.hs    |  2 +-
 src/Settings/Packages/Ghc.hs         |  2 +-
 src/Settings/Packages/GhcCabal.hs    | 12 ++---
 src/Settings/Packages/GhcPrim.hs     |  8 ++--
 src/Settings/Packages/Ghci.hs        |  4 +-
 src/Settings/Packages/Haddock.hs     |  2 +-
 src/Settings/Packages/IntegerGmp.hs  |  2 +-
 src/Settings/Packages/Rts.hs         |  2 +-
 src/Settings/Packages/RunGhc.hs      |  2 +-
 src/Settings/Path.hs                 |  2 +-
 src/Target.hs                        |  2 +-
 src/UserSettings.hs                  |  2 +-
 src/Util.hs                          |  2 +-
 35 files changed, 181 insertions(+), 175 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 2bdb94fda55a4a4b34c8ae1403e3ec07bd7b653c