diff --git a/src/Data/Abstract/Value.hs b/src/Data/Abstract/Value.hs index 9c4c6da3a..e1c530b5e 100644 --- a/src/Data/Abstract/Value.hs +++ b/src/Data/Abstract/Value.hs @@ -96,16 +96,6 @@ instance AbstractEnvironment l (Value l t) where | Just (Interface _ env) <- prj v = env | otherwise = mempty --- | Extract the value back out of a cell. -class CellValue l v where - val :: Cell l v -> v - -instance CellValue Precise v where - val Latest{..} = unLatest - -instance CellValue Monovariant v where - val = undefined - -- | Value types, e.g. closures, which can root a set of addresses. class ValueRoots l v | v -> l where -- | Compute the set of addresses rooted by a given value. diff --git a/src/Data/Syntax/Declaration.hs b/src/Data/Syntax/Declaration.hs index e9217862c..abdbf4282 100644 --- a/src/Data/Syntax/Declaration.hs +++ b/src/Data/Syntax/Declaration.hs @@ -295,7 +295,7 @@ instance ( Members (Evaluating v) es put @(EnvironmentFor v) mempty -- Evaluate the import to get it's environment. - -- (Evaluating will have also have potentially updated the global environment). + -- (requiring will have also have potentially updated the global environment) importedEnv <- require @v (qualifiedName (subterm from)) -- Restore previous global environment, adding the imported env diff --git a/src/Data/Syntax/Expression.hs b/src/Data/Syntax/Expression.hs index bd08810f0..40b3004e4 100644 --- a/src/Data/Syntax/Expression.hs +++ b/src/Data/Syntax/Expression.hs @@ -12,7 +12,7 @@ import Data.Abstract.Environment import Data.Abstract.FreeVariables import Data.Abstract.Store import Data.Abstract.Type as Type -import Data.Abstract.Value (CellValue(..), Value, Interface(..), Closure(..), EnvironmentFor, StoreFor) +import Data.Abstract.Value (Value, Interface(..), Closure(..), EnvironmentFor, StoreFor) import Data.Algebra import Diffing.Algorithm import Prelude hiding (fail)