From 008f628b585e381483f85c82ad600a7a3ccdd96c Mon Sep 17 00:00:00 2001
From: Rob Rix <rob.rix@me.com>
Date: Fri, 18 May 2018 11:07:03 -0400
Subject: [PATCH] Tweak the Evaluatable re-exports.

---
 src/Analysis/Abstract/Graph.hs   |  1 -
 src/Data/Abstract/Evaluatable.hs | 16 +++++++++-------
 src/Language/Go/Syntax.hs        |  3 +--
 src/Semantic/Util.hs             |  5 ++---
 4 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/src/Analysis/Abstract/Graph.hs b/src/Analysis/Abstract/Graph.hs
index 1d695a89c..dc99d21ae 100644
--- a/src/Analysis/Abstract/Graph.hs
+++ b/src/Analysis/Abstract/Graph.hs
@@ -17,7 +17,6 @@ module Analysis.Abstract.Graph
 import           Algebra.Graph.Export.Dot hiding (vertexName)
 import           Control.Abstract
 import           Data.Abstract.Address
-import           Data.Abstract.Evaluatable (LoadError (..))
 import           Data.Abstract.FreeVariables
 import           Data.Abstract.Module (Module(moduleInfo), ModuleInfo(..))
 import           Data.Abstract.Package (PackageInfo(..))
diff --git a/src/Data/Abstract/Evaluatable.hs b/src/Data/Abstract/Evaluatable.hs
index f7c92c513..5a93d27fe 100644
--- a/src/Data/Abstract/Evaluatable.hs
+++ b/src/Data/Abstract/Evaluatable.hs
@@ -6,7 +6,6 @@ module Data.Abstract.Evaluatable
 , traceResolve
 , builtin
 , isolate
-, Modules
 -- | Effects
 , EvalError(..)
 , throwEvalError
@@ -15,14 +14,17 @@ module Data.Abstract.Evaluatable
 , Unspecialized(..)
 , runUnspecialized
 , runUnspecializedWith
+, Cell
 ) where
 
-import Control.Abstract as X hiding (Goto(..), LoopControl(..), Modules(..), Return(..), TermEvaluator(..), builtin, defineBuiltins)
-import Control.Abstract.Evaluator (LoopControl, Return(..))
-import Control.Abstract.Goto (Goto(..))
-import Control.Abstract.Modules (Modules(..))
-import Control.Abstract.Primitive (builtin, defineBuiltins)
-import Control.Abstract.TermEvaluator (TermEvaluator(..))
+import Control.Abstract
+import Control.Abstract.Context as X
+import Control.Abstract.Environment as X hiding (runEnvironmentError, runEnvironmentErrorWith)
+import Control.Abstract.Evaluator as X hiding (LoopControl(..), Return(..))
+import Control.Abstract.Exports as X
+import Control.Abstract.Heap as X hiding (AddressError(..), runAddressError, runAddressErrorWith)
+import Control.Abstract.Modules as X (Modules, ResolutionError(..), load, lookupModule, listModulesInDir, require, resolve)
+import Control.Abstract.Value as X
 import Data.Abstract.Declarations as X
 import Data.Abstract.Environment as X
 import Data.Abstract.Exports as Exports
diff --git a/src/Language/Go/Syntax.hs b/src/Language/Go/Syntax.hs
index 0329ecad3..4d4c9d11f 100644
--- a/src/Language/Go/Syntax.hs
+++ b/src/Language/Go/Syntax.hs
@@ -1,8 +1,7 @@
 {-# LANGUAGE DeriveAnyClass #-}
 module Language.Go.Syntax where
 
-import           Data.Abstract.Evaluatable hiding (Label)
-import           Data.Abstract.FreeVariables (Name (..), name)
+import           Data.Abstract.Evaluatable
 import           Data.Abstract.Module
 import qualified Data.Abstract.Package as Package
 import           Data.Abstract.Path
diff --git a/src/Semantic/Util.hs b/src/Semantic/Util.hs
index abee369d4..2ab77b985 100644
--- a/src/Semantic/Util.hs
+++ b/src/Semantic/Util.hs
@@ -4,9 +4,8 @@ module Semantic.Util where
 
 import           Analysis.Abstract.Caching
 import           Analysis.Abstract.Collecting
-import           Analysis.Abstract.Evaluating as X
-import           Control.Abstract.Evaluator
-import           Control.Abstract.TermEvaluator
+import           Analysis.Abstract.Evaluating
+import           Control.Abstract
 import           Control.Monad.Effect.Trace (runPrintingTrace)
 import           Data.Abstract.Address
 import           Data.Abstract.Evaluatable