Merge pull request #2443 from github/alephd-threading

Alephd threading

src/Data/Syntax/Expression.hs

@@ -5,8 +5,8 @@ module Data.Syntax.Expression where
 import Prelude hiding (null)
 import Prologue hiding (This, index, null)
 
-import           Control.Abstract hiding (Bitwise (..), Call, Member, Void)
-import           Data.Abstract.Evaluatable as Abstract hiding (Member, Void)
+import           Control.Abstract hiding (Bitwise (..), Call, Member)
+import           Data.Abstract.Evaluatable as Abstract hiding (Member)
 import           Data.Abstract.Name as Name
 import           Data.Abstract.Number (liftIntegralFrac, liftReal, liftedExponent, liftedFloorDiv)
 import           Data.Fixed

src/Data/Syntax/Type.hs

@@ -2,7 +2,7 @@
 {-# OPTIONS_GHC -Wno-missing-export-lists #-}
 module Data.Syntax.Type where
 
-import Data.Abstract.Evaluatable hiding (Void)
+import Data.Abstract.Evaluatable
 import Data.JSON.Fields
 import Diffing.Algorithm
 import Prelude hiding (Bool, Float, Int, Double)

src/Rendering/Graph.hs

@@ -29,7 +29,7 @@ renderTreeGraph :: (Ord vertex, Recursive t, ToTreeGraph vertex (Base t)) => t -
 renderTreeGraph = simplify . runGraph . cata toTreeGraph
 
 runGraph :: ReaderC (Graph vertex)
-           (FreshC VoidC) (Graph vertex)
+           (FreshC PureC) (Graph vertex)
          -> Graph vertex
 runGraph = run . runFresh' . runReader mempty
   where

src/Reprinting/Translate.hs

@@ -20,7 +20,7 @@ import qualified Data.Source as Source
 
 type Translator
   = StateC [Scope]
-  ( ErrorC TranslationError VoidC)
+  ( ErrorC TranslationError PureC)
 
 contextualizing :: ProcessT Translator Token Fragment
 contextualizing = repeatedly $ await >>= \case

src/Tags/Tagging.hs

@@ -39,7 +39,7 @@ type ContextToken = (Text, Maybe Range)
 
 type Contextualizer
   = StateC [ContextToken]
-  ( ErrorC TranslationError VoidC)
+  ( ErrorC TranslationError PureC)
 
 contextualizing :: Blob -> Machine.ProcessT Contextualizer Token Tag
 contextualizing Blob{..} = repeatedly $ await >>= \case

vendor/fused-effects

@@ -1 +1 @@
-Subproject commit 17b0a846aa50fd0dea157624c031a550d8edd469
+Subproject commit 25e66959978147b9ee1510ec3d90cd0045cfba54