Consolidate the Evaluatable module’s exports.

src/Analysis/Abstract/Evaluating.hs

@@ -2,6 +2,7 @@
 module Analysis.Abstract.Evaluating where
 
 import Prologue
+import Control.Abstract.Evaluator
 import Control.Effect
 import Control.Monad.Effect.Fail
 import Control.Monad.Effect.Reader
@@ -11,7 +12,6 @@ import Data.Abstract.Evaluatable
 import Data.Abstract.Linker
 import Data.Abstract.Store
 import Data.Abstract.Value
-import Data.Abstract.FreeVariables
 import Data.Blob
 import Prelude hiding (fail)
 import qualified Data.Map as Map

src/Data/Abstract/Evaluatable.hs

@@ -2,28 +2,27 @@
 {-# LANGUAGE TypeApplications #-}
 module Data.Abstract.Evaluatable
 ( Evaluatable(..)
+, AbstractValue(..)
 , module Addressable
-, module Evaluator
-, Recursive(..)
-, Base
-, Subterm(..)
+, module FreeVariables
+, MonadEvaluator(..)
 , MonadFunctionAbstraction(..)
 ) where
 
 import Control.Abstract.Addressable as Addressable
-import Control.Abstract.Evaluator as Evaluator
+import Control.Abstract.Evaluator
 import Control.Applicative (Alternative(..))
 import Control.Monad.Effect.Fail
 import Control.Monad.Effect.Fresh
 import Control.Monad.Effect.Internal
 import Data.Abstract.Address
 import Data.Abstract.Environment
-import Data.Abstract.FreeVariables
+import Data.Abstract.FreeVariables as FreeVariables
 import Data.Abstract.Type as Type
 import Data.Abstract.Value
 import Data.Algebra
 import Data.Functor.Classes
-import Data.Functor.Foldable (Base, Recursive(..), project)
+import Data.Functor.Foldable (Base, Recursive(..))
 import Data.Proxy
 import Data.Semigroup
 import Data.Term

src/Data/Syntax.hs

@@ -5,8 +5,6 @@ import qualified Assigning.Assignment as Assignment
 import Control.Monad.Fail
 import Data.Abstract.Environment
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
-import Data.Abstract.Value (AbstractValue(..))
 import Data.AST
 import Data.ByteString.Char8 (unpack)
 import qualified Data.Error as Error

src/Data/Syntax/Comment.hs

@@ -3,8 +3,6 @@ module Data.Syntax.Comment where
 
 import Prologue
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
-import Data.Abstract.Value
 import Diffing.Algorithm
 
 -- | An unnested comment (line or block).

src/Data/Syntax/Declaration.hs

@@ -4,7 +4,6 @@ module Data.Syntax.Declaration where
 import Prologue
 import Data.Abstract.Environment
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prelude hiding (fail)
 

src/Data/Syntax/Expression.hs

@@ -2,7 +2,6 @@
 module Data.Syntax.Expression where
 
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue hiding (apply)
 import Prelude hiding (fail)

src/Data/Syntax/Literal.hs

@@ -2,8 +2,6 @@
 module Data.Syntax.Literal where
 
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
-import Data.Abstract.Value (AbstractValue(..))
 import Data.ByteString.Char8 (readInteger)
 import Diffing.Algorithm
 import Prologue hiding (Set)

src/Data/Syntax/Statement.hs

@@ -3,7 +3,6 @@ module Data.Syntax.Statement where
 
 import Data.Abstract.Environment
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue
 

src/Data/Syntax/Type.hs

@@ -2,7 +2,6 @@
 module Data.Syntax.Type where
 
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue hiding (Map)
 

src/Language/Python/Syntax.hs

@@ -2,7 +2,6 @@
 module Language.Python.Syntax where
 
 import Data.Abstract.Evaluatable
-import Data.Abstract.FreeVariables
 import Data.Align.Generic
 import Data.Functor.Classes.Generic
 import Data.Mergeable