From 2e39e129cdf49787017c0e054f7bf60f53c2a2f9 Mon Sep 17 00:00:00 2001 From: Patrick Thomson Date: Fri, 8 Nov 2019 22:37:17 -0500 Subject: [PATCH] Make semantic-python tests work. --- semantic-python/test/Directive.hs | 2 +- semantic-python/test/Test.hs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/semantic-python/test/Directive.hs b/semantic-python/test/Directive.hs index 32c3ef9c4..83634e235 100644 --- a/semantic-python/test/Directive.hs +++ b/semantic-python/test/Directive.hs @@ -8,8 +8,8 @@ module Directive ( Directive (..) ) where import Analysis.Concrete (Concrete (..)) +import Control.Algebra import Control.Applicative -import Control.Effect import Control.Monad import Control.Monad.Trans.Resource (ResourceT, runResourceT) import Core.Core (Core) diff --git a/semantic-python/test/Test.hs b/semantic-python/test/Test.hs index b9a49f3fe..140d5ded5 100644 --- a/semantic-python/test/Test.hs +++ b/semantic-python/test/Test.hs @@ -6,9 +6,9 @@ import Analysis.Concrete (Concrete) import qualified Analysis.Concrete as Concrete import Analysis.File import Analysis.ScopeGraph -import Control.Effect -import Control.Effect.Fail -import Control.Effect.Reader +import Control.Algebra +import Control.Carrier.Fail.Either +import Control.Carrier.Reader import Control.Monad hiding (fail) import Control.Monad.Catch import Control.Monad.IO.Class @@ -116,7 +116,7 @@ checkPythonFile fp = HUnit.testCaseSteps (Path.toString fp) $ \step -> withFroze result <- ByteString.readFile (Path.toString fullPath) >>= TS.parseByteString TSP.tree_sitter_python -- Run the compiler - let coreResult = Control.Effect.run + let coreResult = Control.Algebra.run . runFail . runReader @Py.Bindings mempty . Py.toplevelCompile