From 8551034a1b625f5b9383b2789e6764690e2e7931 Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Wed, 7 Mar 2018 21:16:21 -0500
Subject: [PATCH] Re-export Evaluator from Analysis.

---
 src/Analysis/Abstract/Tracing.hs    | 1 -
 src/Control/Abstract/Addressable.hs | 1 -
 src/Control/Abstract/Analysis.hs    | 4 +---
 src/Control/Abstract/Value.hs       | 1 -
 src/Data/Abstract/Evaluatable.hs    | 1 -
 5 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Analysis/Abstract/Tracing.hs b/src/Analysis/Abstract/Tracing.hs
index b9dedf3fa..cead4cbe4 100644
--- a/src/Analysis/Abstract/Tracing.hs
+++ b/src/Analysis/Abstract/Tracing.hs
@@ -2,7 +2,6 @@
 module Analysis.Abstract.Tracing where
 
 import Control.Abstract.Analysis
-import Control.Abstract.Evaluator
 import Control.Monad.Effect.Writer
 import Data.Abstract.Configuration
 import Data.Abstract.Value
diff --git a/src/Control/Abstract/Addressable.hs b/src/Control/Abstract/Addressable.hs
index 2c24183ae..91d2c247e 100644
--- a/src/Control/Abstract/Addressable.hs
+++ b/src/Control/Abstract/Addressable.hs
@@ -2,7 +2,6 @@
 module Control.Abstract.Addressable where
 
 import Control.Abstract.Analysis
-import Control.Abstract.Evaluator
 import Control.Applicative
 import Control.Monad ((<=<))
 import Data.Abstract.Address
diff --git a/src/Control/Abstract/Analysis.hs b/src/Control/Abstract/Analysis.hs
index d8d1f7f69..d91245b1a 100644
--- a/src/Control/Abstract/Analysis.hs
+++ b/src/Control/Abstract/Analysis.hs
@@ -2,14 +2,12 @@
 module Control.Abstract.Analysis
 ( MonadAnalysis(..)
 , delegateAnalyzeTerm
-, TermFor
-, ValueFor
 , module X
 , Subterm(..)
 , SubtermAlgebra
 ) where
 
-import Control.Abstract.Evaluator
+import Control.Abstract.Evaluator as X
 import Control.Effect as X
 import Control.Monad.Effect.Fail as X
 import Control.Monad.Effect.Reader as X
diff --git a/src/Control/Abstract/Value.hs b/src/Control/Abstract/Value.hs
index 55b1cfb4e..26cfd544b 100644
--- a/src/Control/Abstract/Value.hs
+++ b/src/Control/Abstract/Value.hs
@@ -3,7 +3,6 @@ module Control.Abstract.Value where
 
 import Control.Abstract.Addressable
 import Control.Abstract.Analysis
-import Control.Abstract.Evaluator
 import Control.Monad.Effect.Fresh
 import Data.Abstract.Address
 import Data.Abstract.Environment
diff --git a/src/Data/Abstract/Evaluatable.hs b/src/Data/Abstract/Evaluatable.hs
index 414be8945..e4b7e4965 100644
--- a/src/Data/Abstract/Evaluatable.hs
+++ b/src/Data/Abstract/Evaluatable.hs
@@ -12,7 +12,6 @@ module Data.Abstract.Evaluatable
 
 import Control.Abstract.Addressable as Addressable
 import Control.Abstract.Analysis as Analysis
-import Control.Abstract.Evaluator
 import Control.Abstract.Value as Value
 import Data.Abstract.Environment
 import Data.Abstract.FreeVariables as FreeVariables