From 1aab661b0f000f3df4bb9bfacb721f1de7565a8f Mon Sep 17 00:00:00 2001 From: joshvera Date: Fri, 7 Feb 2020 12:28:21 -0500 Subject: [PATCH] fix Void conflicts --- src/Data/Abstract/Value/Type.hs | 2 +- src/Data/Syntax/Expression.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Data/Abstract/Value/Type.hs b/src/Data/Abstract/Value/Type.hs index ed1c77bde..73a828331 100644 --- a/src/Data/Abstract/Value/Type.hs +++ b/src/Data/Abstract/Value/Type.hs @@ -34,7 +34,7 @@ import Data.List.NonEmpty (NonEmpty, nonEmpty) import qualified Data.Map as Map import Control.Abstract hiding - (Array (..), Boolean (..), Function (..), Hash (..), Numeric (..), Object (..), String (..), Unit (..), While (..)) + (Array (..), Boolean (..), Function (..), Hash (..), Numeric (..), Object (..), String (..), Unit (..), While (..), Void) import qualified Control.Abstract as Abstract import Data.Abstract.BaseError import Data.Abstract.Evaluatable diff --git a/src/Data/Syntax/Expression.hs b/src/Data/Syntax/Expression.hs index bf5915f49..486401303 100644 --- a/src/Data/Syntax/Expression.hs +++ b/src/Data/Syntax/Expression.hs @@ -14,7 +14,7 @@ module Data.Syntax.Expression (module Data.Syntax.Expression) where import Prelude hiding (null) import Analysis.Name as Name -import Control.Abstract hiding (Bitwise (..), Call) +import Control.Abstract hiding (Bitwise (..), Call, Void) import Control.Applicative import Control.Monad import Data.Abstract.Evaluatable as Abstract