manually handle recursion in HO effects

src/Juvix/Compiler/Core/Transformation/UnrollRecursion.hs

@@ -11,10 +11,11 @@ import Juvix.Compiler.Core.Transformation.Base
 unrollRecursion :: (Member (Reader CoreOptions) r) => Module -> Sem r Module
 unrollRecursion md = do
   (mp, md') <-
-    runState @(HashMap Symbol Symbol) mempty $
-      execInfoTableBuilder md $
-        forM_ (buildSCCs (createCallGraph (md ^. moduleInfoTable))) goSCC
-  return $ mapIdentSymbols mp $ pruneInfoTable md'
+    runState @(HashMap Symbol Symbol) mempty
+      . execInfoTableBuilder md
+      . forM_ (buildSCCs (createCallGraph (md ^. moduleInfoTable)))
+      $ goSCC
+  return . mapIdentSymbols mp $ pruneInfoTable md'
   where
     mapIdentSymbols :: HashMap Symbol Symbol -> Module -> Module
     mapIdentSymbols mp = over (moduleInfoTable . infoMain) adjustMain . mapAllNodes (umap go)

src/Juvix/Compiler/Pipeline/Loader/PathResolver.hs

@@ -418,9 +418,11 @@ runPathResolver2 st topEnv arg = do
     arg
   where
     handler ::
-      forall t.
+      forall t localEs x.
       (Members v t) =>
-      EffectHandler PathResolver (Reader ResolverEnv ': State ResolverState ': t)
+      LocalEnv localEs (Reader ResolverEnv ': State ResolverState ': t) ->
+      PathResolver (Sem localEs) x ->
+      Sem (Reader ResolverEnv ': State ResolverState ': t) x
     handler localEnv = \case
       RegisterDependencies forceUpdateLockfile -> registerDependencies' forceUpdateLockfile
       ExpectedPathInfoTopModule m -> expectedPath' m
@@ -433,7 +435,6 @@ runPathResolver2 st topEnv arg = do
           x :: Either PathResolverError (Path Abs Dir, Path Rel File) <- resolvePath' m
           let y :: Sem localEs x = a x
           oldroot <- asks (^. envRoot)
-          st' <- get
           let root' = case x of
                 Left {} -> oldroot
                 Right (r, _) -> r
@@ -449,26 +450,11 @@ runPathResolver2 st topEnv arg = do
                     _envLockfileInfo = Nothing,
                     _envSingleFile
                   }
-
-          let runner ::
-                forall q handlerEs.
-                (handlerEs ~ (Reader ResolverEnv ': State ResolverState ': q)) =>
-                Sem handlerEs x ->
-                Sem q x
-              runner = evalState st' . runReader env'
-              helper :: (forall w. Sem localEs w -> Sem t w) -> Sem t x
-              helper unlift =
-                localSeqHandle2 @TaggedLock localEnv $ \env1 withTaggedLockEff ->
-                  localSeqHandle2 @(Reader EntryPoint) env1 $ \env2 withEntryPoint ->
-                    localSeqHandle2 @Files env2 $ \env3 withFiles ->
-                      localSeqHandle2 @(Error JuvixError) env3 $ \env4 withJuvixError ->
-                        localSeqHandle2 @(Error DependencyError) env4 $ \env5 withDependencyError ->
-                          localSeqHandle2 @GitClone env5 $ \env6 withGitClone ->
-                            localSeqHandle @EvalFileEff env6 $ \withEvalFileEff -> do
-                              unlift . withTaggedLockEff . withEntryPoint . withFiles . withJuvixError . withDependencyError . withGitClone . withEvalFileEff $ impose runner handler (inject y)
-              inner :: Sem t x = localSeqUnlift localEnv helper
-
-          inject inner
+          localSeqUnlift localEnv $ \unlift -> local (const env') $ do
+            oldState <- get @ResolverState
+            res <- unlift y
+            put oldState
+            return res
 
 runPathResolver :: (Members '[TaggedLock, Reader EntryPoint, Files, Error JuvixError, Error DependencyError, GitClone, EvalFileEff] r) => Path Abs Dir -> Sem (PathResolver ': r) a -> Sem r (ResolverState, a)
 runPathResolver = runPathResolver' iniResolverState

src/Juvix/Data/Effect/ExactPrint/Base.hs

@@ -91,16 +91,6 @@ runExactPrint cs = reinterpretH (runPrivateStateAsDoc (initialBuilder cs)) handl
             }
         return fx
 
-t :: IO ()
-t = putStrLn . toPlainText . fst . run . runExactPrint Nothing $ do
-  noLoc "hello 1\n"
-  region (\x -> "*" <> x <> "!") $ do
-    noLoc "hello 2\n"
-    noLoc "bye"
-
--- evalExactPrint' :: Builder -> Sem (ExactPrint ': r) a -> Sem r (Builder, a)
--- evalExactPrint' b = runState b . re
-
 enqueue' :: forall r. (Members '[State Builder] r) => Doc Ann -> Sem r ()
 enqueue' d = modify (over builderQueue (d :))
 

src/Juvix/Prelude/Effects/Base.hs

@@ -8,7 +8,6 @@ module Juvix.Prelude.Effects.Base
     module Effectful.TH,
     module Effectful.Dispatch.Static,
     module Effectful.Provider,
-    module Juvix.Prelude.Effects.Base.Internal,
   )
 where
 
@@ -26,7 +25,6 @@ import Effectful.State.Static.Local hiding (runState, state)
 import Effectful.State.Static.Local qualified as State
 import Effectful.TH
 import Juvix.Prelude.Base.Foundation
-import Juvix.Prelude.Effects.Base.Internal
 import Language.Haskell.TH.Syntax qualified as GHC
 
 type Sem = E.Eff
@@ -76,7 +74,7 @@ mapReader f s = do
   e <- ask
   runReader (f e) s
 
-runState :: forall a s r. s -> Sem (State s ': r) a -> Sem r (s, a)
+runState :: forall s r a. s -> Sem (State s ': r) a -> Sem r (s, a)
 runState s = fmap swap . State.runState s
 
 -- | TODO can we make it strict?