From d8540f9e4ccbaffd418e6dbf57e41d3302212f32 Mon Sep 17 00:00:00 2001 From: Rob Rix Date: Thu, 1 Mar 2018 11:59:23 -0500 Subject: [PATCH] =?UTF-8?q?Consolidate=20the=20Evaluatable=20module?= =?UTF-8?q?=E2=80=99s=20exports.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/Analysis/Abstract/Evaluating.hs | 2 +- src/Data/Abstract/Evaluatable.hs | 13 ++++++------- src/Data/Syntax.hs | 2 -- src/Data/Syntax/Comment.hs | 2 -- src/Data/Syntax/Declaration.hs | 1 - src/Data/Syntax/Expression.hs | 1 - src/Data/Syntax/Literal.hs | 2 -- src/Data/Syntax/Statement.hs | 1 - src/Data/Syntax/Type.hs | 1 - src/Language/Python/Syntax.hs | 1 - 10 files changed, 7 insertions(+), 19 deletions(-) diff --git a/src/Analysis/Abstract/Evaluating.hs b/src/Analysis/Abstract/Evaluating.hs index 4774be504..5c1e0f217 100644 --- a/src/Analysis/Abstract/Evaluating.hs +++ b/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 diff --git a/src/Data/Abstract/Evaluatable.hs b/src/Data/Abstract/Evaluatable.hs index 5b261cc5c..c92296e39 100644 --- a/src/Data/Abstract/Evaluatable.hs +++ b/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 diff --git a/src/Data/Syntax.hs b/src/Data/Syntax.hs index ee7d1a80c..ad0d27aac 100644 --- a/src/Data/Syntax.hs +++ b/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 diff --git a/src/Data/Syntax/Comment.hs b/src/Data/Syntax/Comment.hs index 7a40e0469..249af44c1 100644 --- a/src/Data/Syntax/Comment.hs +++ b/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). diff --git a/src/Data/Syntax/Declaration.hs b/src/Data/Syntax/Declaration.hs index 84fe54de1..2e45e9f6d 100644 --- a/src/Data/Syntax/Declaration.hs +++ b/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) diff --git a/src/Data/Syntax/Expression.hs b/src/Data/Syntax/Expression.hs index 8d97f42a2..be15b9077 100644 --- a/src/Data/Syntax/Expression.hs +++ b/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) diff --git a/src/Data/Syntax/Literal.hs b/src/Data/Syntax/Literal.hs index d75a15bce..9d08dcbb6 100644 --- a/src/Data/Syntax/Literal.hs +++ b/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) diff --git a/src/Data/Syntax/Statement.hs b/src/Data/Syntax/Statement.hs index befd45bd4..87cabe977 100644 --- a/src/Data/Syntax/Statement.hs +++ b/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 diff --git a/src/Data/Syntax/Type.hs b/src/Data/Syntax/Type.hs index 737947025..364ebd607 100644 --- a/src/Data/Syntax/Type.hs +++ b/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) diff --git a/src/Language/Python/Syntax.hs b/src/Language/Python/Syntax.hs index 3a7363bff..f887078c5 100644 --- a/src/Language/Python/Syntax.hs +++ b/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