Re-export Expression from Predicates

src/Expression.hs

@@ -19,6 +19,7 @@ module Expression (
     getInput, getOutput,
 
     -- * Re-exports
+    module Control.Monad.Trans.Reader,
     module Data.Monoid,
     module Builder,
     module Package,

src/Predicates.hs

 {-# LANGUAGE LambdaCase, FlexibleInstances #-}
 -- | Convenient predicates
 module Predicates (
+    module Expression,
     stage, stage0, stage1, stage2, notStage0,
     package, notPackage, builder, input, output, way
     ) where

src/Settings/Builders/Alex.hs

 module Settings.Builders.Alex (alexBuilderArgs) where
 
-import Expression
 import Predicates
 
 alexBuilderArgs :: Args

src/Settings/Builders/Ar.hs

 module Settings.Builders.Ar (arBuilderArgs, arCmd, chunksOfSize) where
 
 import Base
-import Expression
 import Oracles.Config.Flag
 import Oracles.Config.Setting
 import Predicates

src/Settings/Builders/Cc.hs

 module Settings.Builders.Cc (ccBuilderArgs) where
 
 import Base
-import Expression
 import Oracles.Config.Setting
 import Oracles.PackageData
 import Predicates

src/Settings/Builders/Configure.hs

 module Settings.Builders.Configure (configureBuilderArgs) where
 
 import Base
-import Expression
 import Oracles.Config.Setting
 import Predicates
 import Settings

src/Settings/Builders/DeriveConstants.hs

 module Settings.Builders.DeriveConstants (deriveConstantsBuilderArgs) where
 
 import Base
-import Expression
 import Oracles.Config.Flag
 import Oracles.Config.Setting
 import Predicates

src/Settings/Builders/GenApply.hs

 module Settings.Builders.GenApply (genApplyBuilderArgs) where
 
-import Expression
+import Predicates
 
 -- Stdin/stdout are handled in a special way. See Rules/Actions.hs.
 -- TODO: Dead code? ifeq "$(GhcUnregisterised)" "YES" GENAPPLY_OPTS = -u

src/Settings/Builders/GenPrimopCode.hs

 module Settings.Builders.GenPrimopCode (genPrimopCodeBuilderArgs) where
 
-import Expression
 import Predicates
 
 -- Stdin/stdout are handled in a special way. See Rules/Actions.hs.

src/Settings/Builders/Ghc.hs

 module Settings.Builders.Ghc (ghcBuilderArgs, ghcMBuilderArgs, commonGhcArgs) where
 
-import Control.Monad.Trans.Reader
-
 import Base
-import Expression
 import GHC
 import Oracles.Config.Flag
 import Oracles.Config.Setting

src/Settings/Builders/GhcCabal.hs

@@ -6,7 +6,6 @@ module Settings.Builders.GhcCabal (
 
 import Base
 import Builder
-import Expression
 import GHC
 import Oracles.Config.Flag
 import Oracles.Config.Setting

src/Settings/Builders/GhcPkg.hs

@@ -2,7 +2,6 @@ module Settings.Builders.GhcPkg (ghcPkgBuilderArgs) where
 
 import Base
 import Builder
-import Expression
 import Predicates
 import Settings
 import Settings.Builders.GhcCabal

src/Settings/Builders/Haddock.hs

@@ -2,9 +2,8 @@ module Settings.Builders.Haddock (haddockBuilderArgs) where
 
 import Base
 import GHC
-import Package
-import Expression
 import Oracles.PackageData
+import Package
 import Predicates
 import Settings
 import Settings.Builders.Ghc

src/Settings/Builders/Happy.hs

 module Settings.Builders.Happy (happyBuilderArgs) where
 
-import Expression
 import Predicates
 
 happyBuilderArgs :: Args

src/Settings/Builders/HsCpp.hs

 module Settings.Builders.HsCpp (hsCppBuilderArgs) where
 
-import Expression
 import GHC
 import Oracles.Config.Setting
 import Predicates

src/Settings/Builders/Hsc2Hs.hs

 module Settings.Builders.Hsc2Hs (hsc2hsBuilderArgs) where
 
-import Control.Monad.Extra
-import Control.Monad.Trans.Class
-
 import Base
-import Expression
 import Oracles.Config.Flag
 import Oracles.Config.Setting
 import Oracles.PackageData

src/Settings/Builders/Ld.hs

 module Settings.Builders.Ld (ldBuilderArgs) where
 
-import Expression
 import Oracles.Config.Setting
-import Predicates (builder)
+import Predicates
 
 ldBuilderArgs :: Args
 ldBuilderArgs = builder Ld ? do

src/Settings/Builders/Make.hs

 module Settings.Builders.Make (makeBuilderArgs) where
 
-import Expression
 import Predicates
 import Settings
 

src/Settings/Builders/Tar.hs

 module Settings.Builders.Tar (tarBuilderArgs) where
 
 import Base
-import Expression
 import Predicates
 
 tarBuilderArgs :: Args

src/Settings/Default.hs

 module Settings.Default (defaultSplitObjects) where
 
 import Base
-import Expression
 import GHC
 import Oracles.Config.Flag
-import Predicates (notStage0)
+import Predicates
 
 defaultSplitObjects :: Predicate
 defaultSplitObjects = do