Rename Control.Monad.Effect.Evaluatable to Data.Abstract.Evaluatable.

semantic-diff.cabal

@@ -37,7 +37,6 @@ library
                      -- Effects used in abstract interpretation
                      -- , Control.Monad.Effect.Cache
                      -- , Control.Monad.Effect.Dead
-                     , Control.Monad.Effect.Evaluatable
                      -- , Control.Monad.Effect.Fresh
                      -- , Control.Monad.Effect.GC
                      -- , Control.Monad.Effect.NonDet
@@ -47,6 +46,7 @@ library
                      , Data.Abstract.Cache
                      , Data.Abstract.Configuration
                      , Data.Abstract.Environment
+                     , Data.Abstract.Evaluatable
                      , Data.Abstract.Linker
                      , Data.Abstract.FreeVariables
                      , Data.Abstract.Live

src/Analysis/Abstract/Evaluating.hs

@@ -3,11 +3,11 @@ module Analysis.Abstract.Evaluating where
 
 import Prologue
 import Control.Effect
-import Control.Monad.Effect.Evaluatable
 import Control.Monad.Effect.Fail
 import Control.Monad.Effect.Reader
 import Control.Monad.Effect.State
 import Data.Abstract.Address
+import Data.Abstract.Evaluatable
 import Data.Abstract.Linker
 import Data.Abstract.Store
 import Data.Abstract.Value

src/Data/Abstract/Evaluatable.hs

@@ -1,6 +1,6 @@
 {-# LANGUAGE DataKinds, FunctionalDependencies, MultiParamTypeClasses, Rank2Types, GADTs, TypeOperators, DefaultSignatures, UndecidableInstances, ScopedTypeVariables #-}
 {-# LANGUAGE TypeApplications #-}
-module Control.Monad.Effect.Evaluatable
+module Data.Abstract.Evaluatable
 ( Evaluatable(..)
 , module Addressable
 , module Evaluator

src/Data/Syntax.hs

@@ -2,9 +2,9 @@
 module Data.Syntax where
 
 import qualified Assigning.Assignment as Assignment
-import Control.Monad.Effect.Evaluatable
 import Control.Monad.Fail
 import Data.Abstract.Environment
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value (AbstractValue(..))
 import Data.AST

src/Data/Syntax/Comment.hs

@@ -2,9 +2,9 @@
 module Data.Syntax.Comment where
 
 import Prologue
-import Control.Monad.Effect.Evaluatable
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
-import Data.Abstract.Value as Value
+import Data.Abstract.Value
 import Diffing.Algorithm
 
 -- | An unnested comment (line or block).

src/Data/Syntax/Declaration.hs

@@ -2,8 +2,8 @@
 module Data.Syntax.Declaration where
 
 import Prologue
-import Control.Monad.Effect.Evaluatable
 import Data.Abstract.Environment
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prelude hiding (fail)

src/Data/Syntax/Expression.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveAnyClass, MultiParamTypeClasses, ScopedTypeVariables, UndecidableInstances, TypeApplications #-}
 module Data.Syntax.Expression where
 
-import Control.Monad.Effect.Evaluatable
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue hiding (apply)

src/Data/Syntax/Literal.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds, DeriveAnyClass, DeriveGeneric, MultiParamTypeClasses #-}
 module Data.Syntax.Literal where
 
-import Control.Monad.Effect.Evaluatable
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Abstract.Value (AbstractValue(..))
 import Data.ByteString.Char8 (readInteger)

src/Data/Syntax/Statement.hs

@@ -1,8 +1,8 @@
 {-# LANGUAGE DeriveAnyClass, MultiParamTypeClasses, ScopedTypeVariables, UndecidableInstances #-}
 module Data.Syntax.Statement where
 
-import Control.Monad.Effect.Evaluatable
 import Data.Abstract.Environment
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue

src/Data/Syntax/Type.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DataKinds, DeriveAnyClass, DeriveGeneric, MultiParamTypeClasses, UndecidableInstances #-}
 module Data.Syntax.Type where
 
-import Control.Monad.Effect.Evaluatable
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Diffing.Algorithm
 import Prologue hiding (Map)

src/Language/Python/Syntax.hs

@@ -1,7 +1,7 @@
 {-# LANGUAGE DeriveAnyClass, MultiParamTypeClasses #-}
 module Language.Python.Syntax where
 
-import Control.Monad.Effect.Evaluatable
+import Data.Abstract.Evaluatable
 import Data.Abstract.FreeVariables
 import Data.Align.Generic
 import Data.Functor.Classes.Generic