diff --git a/semantic.cabal b/semantic.cabal index 54783c487..cd99b0e0c 100644 --- a/semantic.cabal +++ b/semantic.cabal @@ -66,7 +66,7 @@ library , Data.Abstract.Path , Data.Abstract.Ref , Data.Abstract.Type - , Data.Abstract.Value + , Data.Abstract.Value.Concrete -- General datatype definitions & generic algorithms , Data.Algebra , Data.AST diff --git a/src/Data/Abstract/Value.hs b/src/Data/Abstract/Value/Concrete.hs similarity index 99% rename from src/Data/Abstract/Value.hs rename to src/Data/Abstract/Value/Concrete.hs index b14021db7..9968bec87 100644 --- a/src/Data/Abstract/Value.hs +++ b/src/Data/Abstract/Value/Concrete.hs @@ -1,5 +1,5 @@ {-# LANGUAGE GADTs, RankNTypes, TypeOperators, UndecidableInstances #-} -module Data.Abstract.Value where +module Data.Abstract.Value.Concrete where import Control.Abstract import Data.Abstract.Environment (Environment, mergeEnvs) diff --git a/src/Semantic/Graph.hs b/src/Semantic/Graph.hs index be018c793..ead71e0ac 100644 --- a/src/Semantic/Graph.hs +++ b/src/Semantic/Graph.hs @@ -29,7 +29,7 @@ import Data.Abstract.Evaluatable import Data.Abstract.Module import qualified Data.Abstract.ModuleTable as ModuleTable import Data.Abstract.Package as Package -import Data.Abstract.Value (Value, ValueError (..), runValueErrorWith) +import Data.Abstract.Value.Concrete (Value, ValueError (..), runValueErrorWith) import Data.Graph import Data.Project import Data.Record diff --git a/src/Semantic/Util.hs b/src/Semantic/Util.hs index e06100ea4..6a146d555 100644 --- a/src/Semantic/Util.hs +++ b/src/Semantic/Util.hs @@ -10,11 +10,11 @@ import Control.Abstract import Control.Monad.Effect.Trace (runPrintingTrace) import Data.Abstract.Address import Data.Abstract.Evaluatable -import Data.Abstract.Value import Data.Abstract.Module import qualified Data.Abstract.ModuleTable as ModuleTable import Data.Abstract.Package import Data.Abstract.Type +import Data.Abstract.Value.Concrete import Data.Blob import Data.Functor.Foldable import Data.Graph (topologicalSort) diff --git a/test/Analysis/Python/Spec.hs b/test/Analysis/Python/Spec.hs index cceabf849..39ae7b36b 100644 --- a/test/Analysis/Python/Spec.hs +++ b/test/Analysis/Python/Spec.hs @@ -3,7 +3,7 @@ module Analysis.Python.Spec (spec) where import Data.Abstract.Environment as Env import Data.Abstract.Evaluatable (EvalError(..)) import qualified Data.Abstract.ModuleTable as ModuleTable -import Data.Abstract.Value +import Data.Abstract.Value.Concrete import qualified Language.Python.Assignment as Python import qualified Data.Language as Language diff --git a/test/Analysis/Ruby/Spec.hs b/test/Analysis/Ruby/Spec.hs index e935e437e..f0b75b35d 100644 --- a/test/Analysis/Ruby/Spec.hs +++ b/test/Analysis/Ruby/Spec.hs @@ -2,9 +2,9 @@ module Analysis.Ruby.Spec (spec) where import Data.Abstract.Environment as Env import Data.Abstract.Evaluatable -import Data.Abstract.Value as Value import qualified Data.Abstract.ModuleTable as ModuleTable import Data.Abstract.Number as Number +import Data.Abstract.Value.Concrete as Value import Data.AST import Control.Monad.Effect (SomeExc(..)) import Data.List.NonEmpty (NonEmpty(..)) diff --git a/test/Analysis/TypeScript/Spec.hs b/test/Analysis/TypeScript/Spec.hs index 2f422ded3..4bcc69a09 100644 --- a/test/Analysis/TypeScript/Spec.hs +++ b/test/Analysis/TypeScript/Spec.hs @@ -3,9 +3,9 @@ module Analysis.TypeScript.Spec (spec) where import Control.Arrow ((&&&)) import Data.Abstract.Environment as Env import Data.Abstract.Evaluatable -import Data.Abstract.Value as Value import Data.Abstract.Number as Number import qualified Data.Abstract.ModuleTable as ModuleTable +import Data.Abstract.Value.Concrete as Value import qualified Data.Language as Language import qualified Data.List.NonEmpty as NonEmpty import Data.Sum diff --git a/test/Control/Abstract/Evaluator/Spec.hs b/test/Control/Abstract/Evaluator/Spec.hs index 0d54f31b9..8bc24c935 100644 --- a/test/Control/Abstract/Evaluator/Spec.hs +++ b/test/Control/Abstract/Evaluator/Spec.hs @@ -8,7 +8,7 @@ import Control.Abstract import Data.Abstract.Module import qualified Data.Abstract.Number as Number import Data.Abstract.Package -import Data.Abstract.Value as Value +import Data.Abstract.Value.Concrete as Value import Data.Algebra import Data.Bifunctor (first) import Data.Functor.Const diff --git a/test/SpecHelpers.hs b/test/SpecHelpers.hs index b4823e846..626748bd4 100644 --- a/test/SpecHelpers.hs +++ b/test/SpecHelpers.hs @@ -25,7 +25,7 @@ import Data.Abstract.Heap as X import Data.Abstract.Module as X import Data.Abstract.ModuleTable as X hiding (lookup) import Data.Abstract.Name as X -import Data.Abstract.Value (Value(..), ValueError, runValueError) +import Data.Abstract.Value.Concrete (Value(..), ValueError, runValueError) import Data.Bifunctor (first) import Data.Blob as X import Data.ByteString.Builder (toLazyByteString)