fixing pipeline

src/Juvix/Compiler/Builtins/Effect.hs

@@ -21,20 +21,18 @@ registerBuiltin = registerBuiltin' . toBuiltinPrim
 getBuiltinSymbol :: (IsBuiltin a, Member Builtins r) => Interval -> a -> Sem r Symbol
 getBuiltinSymbol i = getBuiltinSymbol' i . toBuiltinPrim
 
-newtype BuiltinsState = BuiltinsState
-  { _builtinsTable :: HashMap BuiltinPrim Symbol
-  }
-
-makeLenses ''BuiltinsState
-
-iniBuiltins :: BuiltinsState
-iniBuiltins = BuiltinsState mempty
-
-runBuiltins :: forall r a. (Member (Error BuiltinsError) r) => BuiltinsState -> Sem (Builtins ': r) a -> Sem r (BuiltinsState, a)
+type BuiltinsTable = HashMap BuiltinPrim Symbol
+
+runBuiltins ::
+  forall r a.
+  (Member (Error BuiltinsError) r) =>
+  BuiltinsTable ->
+  Sem (Builtins ': r) a ->
+  Sem r (BuiltinsTable, a)
 runBuiltins ini = reinterpret (runState ini) $ \case
-  GetBuiltinSymbol' i b -> fromMaybeM notDefined (gets (^. builtinsTable . at b))
+  GetBuiltinSymbol' i b -> fromMaybeM notDefined (gets @BuiltinsTable (^. at b))
     where
-      notDefined :: Sem (State BuiltinsState ': r) x
+      notDefined :: Sem (State BuiltinsTable ': r) x
       notDefined =
         throw $
           ErrNotDefined
@@ -43,13 +41,12 @@ runBuiltins ini = reinterpret (runState ini) $ \case
                 _notDefinedLoc = i
               }
   RegisterBuiltin' b n -> do
-    s <- gets (^. builtinsTable . at b)
+    s <- gets @BuiltinsTable (^. at b)
     case s of
-      Nothing -> do
-        modify (over builtinsTable (set (at b) (Just n)))
+      Nothing -> modify @BuiltinsTable (set (at b) (Just n))
       Just {} -> alreadyDefined
     where
-      alreadyDefined :: Sem (State BuiltinsState ': r) x
+      alreadyDefined :: Sem (State BuiltinsTable ': r) x
       alreadyDefined =
         throw $
           ErrAlreadyDefined
@@ -58,5 +55,5 @@ runBuiltins ini = reinterpret (runState ini) $ \case
                 _alreadyDefinedLoc = getLoc n
               }
 
-evalBuiltins :: (Member (Error BuiltinsError) r) => BuiltinsState -> Sem (Builtins ': r) a -> Sem r a
+evalBuiltins :: (Member (Error BuiltinsError) r) => BuiltinsTable -> Sem (Builtins ': r) a -> Sem r a
 evalBuiltins s = fmap snd . runBuiltins s

src/Juvix/Compiler/Concrete/Translation/FromParsed.hs

@@ -5,7 +5,6 @@ module Juvix.Compiler.Concrete.Translation.FromParsed
   )
 where
 
-import Juvix.Compiler.Builtins.Effect
 import Juvix.Compiler.Concrete.Data.Highlight
 import Juvix.Compiler.Concrete.Language
 import Juvix.Compiler.Concrete.Translation.FromParsed.Analysis.Scoping
@@ -23,8 +22,7 @@ fromParsed ::
          Reader ModuleTable,
          Reader Parsed.ParserResult,
          Error JuvixError,
-         NameIdGen,
-         Builtins
+         NameIdGen
        ]
       r
   ) =>

src/Juvix/Compiler/Concrete/Translation/FromParsed/Analysis/Scoping.hs

@@ -67,20 +67,14 @@ scopeCheck' ::
 scopeCheck' importTab pr m = do
   fmap mkResult
     . runReader tab
-    . evalBuiltins builtinsState
+    . evalBuiltins (tab ^. infoBuiltins)
     . runReader iniScopeParameters
     . runState (iniScoperState tab)
     $ checkTopModule m
   where
     tab :: InfoTable
     tab = computeCombinedInfoTable importTab
 
-    builtinsState :: BuiltinsState
-    builtinsState =
-      BuiltinsState
-        { _builtinsTable = tab ^. infoBuiltins
-        }
-
     iniScopeParameters :: ScopeParameters
     iniScopeParameters =
       ScopeParameters

src/Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/CheckerNew.hs

@@ -139,6 +139,7 @@ checkCoercionCycles = do
       . ErrCoercionCycles
       . CoercionCycles
 
+-- TODO consider passing only builtin information instead of the whole S.InfoTable
 checkTopModule ::
   (Members '[HighlightBuilder, Reader S.InfoTable, Reader EntryPoint, Reader InfoTable, Error TypeCheckerError, NameIdGen, ResultBuilder, Termination] r) =>
   Module ->

src/Juvix/Compiler/Internal/Translation/Repl.hs

@@ -5,10 +5,13 @@ module Juvix.Compiler.Internal.Translation.Repl
   )
 where
 
+import Juvix.Compiler.Concrete.Data.Highlight
 import Juvix.Compiler.Internal.Data.LocalVars
 import Juvix.Compiler.Internal.Language
-import Juvix.Compiler.Internal.Translation.FromInternal
+import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.Termination
+import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking
 import Juvix.Compiler.Pipeline.Artifacts
+import Juvix.Prelude
 
 typeCheckExpressionType ::
   forall r.
@@ -17,11 +20,13 @@ typeCheckExpressionType ::
   Sem r TypedExpression
 typeCheckExpressionType exp = do
   table <- extendedTableReplArtifacts exp
+  stable <- gets (^. artifactScopeTable)
   runResultBuilderArtifacts
     . runBuiltinsArtifacts
     . runNameIdGenArtifacts
     . ignoreHighlightBuilder
     . runReader table
+    . runReader stable
     . withEmptyLocalVars
     . withEmptyInsertedArgsStack
     . mapError (JuvixError @TypeCheckerError)

src/Juvix/Compiler/Pipeline/Artifacts.hs

@@ -10,7 +10,6 @@ module Juvix.Compiler.Pipeline.Artifacts
 where
 
 import Juvix.Compiler.Builtins
-import Juvix.Compiler.Builtins.Effect qualified as Builtins
 import Juvix.Compiler.Concrete.Data.InfoTableBuilder qualified as Scoped
 import Juvix.Compiler.Concrete.Data.Scope qualified as S
 import Juvix.Compiler.Core.Data.InfoTableBuilder qualified as Core
@@ -28,7 +27,7 @@ import Juvix.Prelude
 appendArtifactsModuleTable :: ModuleTable -> Artifacts -> Artifacts
 appendArtifactsModuleTable mtab =
   over artifactInternalTypedTable (computeCombinedInfoTable importTab <>)
-    . over (artifactBuiltins . Builtins.builtinsTable) (computeCombinedBuiltins mtab <>)
+    . over (artifactBuiltins) (computeCombinedBuiltins mtab <>)
     . over (artifactCoreModule . Core.moduleImportsTable) (computeCombinedCoreInfoTable mtab <>)
     . over artifactModuleTable (mtab <>)
   where
@@ -49,9 +48,11 @@ tmpCoreInfoTableBuilderArtifacts m = do
   modify' (set artifactCoreModule md)
   return a
 
-runBuiltinsArtifacts :: (Members '[Error JuvixError, State Artifacts] r) => Sem (Builtins ': r) a -> Sem r a
+runBuiltinsArtifacts :: forall r a. (Members '[Error JuvixError, State Artifacts] r) => Sem (Builtins ': r) a -> Sem r a
 runBuiltinsArtifacts =
-  runStateLikeArtifacts runBuiltins artifactBuiltins
+  mapError (JuvixError @BuiltinsError)
+    . runStateLikeArtifacts runBuiltins artifactBuiltins
+    . inject
 
 runScoperInfoTableBuilderArtifacts :: (Members '[State Artifacts] r) => Sem (Scoped.InfoTableBuilder ': r) a -> Sem r a
 runScoperInfoTableBuilderArtifacts = runStateLikeArtifacts Scoped.runInfoTableBuilderRepl artifactScopeTable

src/Juvix/Compiler/Pipeline/Artifacts/Base.hs

@@ -20,7 +20,7 @@ data Artifacts = Artifacts
   { _artifactParsing :: ParserState,
     -- Scoping
     _artifactResolver :: ResolverState,
-    _artifactBuiltins :: BuiltinsState,
+    _artifactBuiltins :: BuiltinsTable,
     _artifactNameIdState :: NameIdGenState,
     _artifactScopeTable :: Scoped.InfoTable,
     _artifactScopeExports :: HashSet NameId,

src/Juvix/Compiler/Pipeline/Repl.hs

@@ -13,6 +13,7 @@ import Juvix.Compiler.Core.Transformation.DisambiguateNames (disambiguateNames)
 import Juvix.Compiler.Internal qualified as Internal
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.Termination.Checker
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Error
+import Juvix.Compiler.Internal.Translation.Repl qualified as Repl
 import Juvix.Compiler.Pipeline.Artifacts
 import Juvix.Compiler.Pipeline.Artifacts.PathResolver
 import Juvix.Compiler.Pipeline.Driver
@@ -110,7 +111,7 @@ expressionUpToTyped fp txt = do
   p <- expressionUpToAtomsParsed fp txt
   runTerminationArtifacts
     ( upToInternalExpression p
-        >>= Internal.typeCheckExpressionType
+        >>= Repl.typeCheckExpressionType
     )
 
 compileExpression ::
@@ -120,7 +121,7 @@ compileExpression ::
 compileExpression p =
   runTerminationArtifacts
     ( upToInternalExpression p
-        >>= Internal.typeCheckExpression
+        >>= Repl.typeCheckExpression
     )
     >>= fromInternalExpression
 

src/Juvix/Compiler/Pipeline/Run.hs

@@ -4,7 +4,6 @@ module Juvix.Compiler.Pipeline.Run
   )
 where
 
-import Juvix.Compiler.Builtins
 import Juvix.Compiler.Concrete.Data.Highlight
 import Juvix.Compiler.Concrete.Data.Scope
 import Juvix.Compiler.Concrete.Translation.FromParsed.Analysis.Scoping qualified as Scoped
@@ -318,7 +317,7 @@ runReplPipelineIOEither' lockMode entry = do
           _artifactCoercions = mempty,
           _artifactCoreModule = Core.emptyModule,
           _artifactScopeTable = mempty,
-          _artifactBuiltins = iniBuiltins,
+          _artifactBuiltins = mempty,
           _artifactScopeExports = mempty,
           _artifactScoperState = Scoper.iniScoperState mempty,
           _artifactModuleTable = mempty

src/Juvix/Compiler/Store/Scoped/Data/InfoTable.hs

@@ -2,6 +2,7 @@ module Juvix.Compiler.Store.Scoped.Data.InfoTable where
 
 import Data.HashMap.Strict qualified as HashMap
 import Data.HashSet qualified as HashSet
+import Juvix.Compiler.Builtins.Effect (BuiltinsTable)
 import Juvix.Compiler.Concrete.Data.ScopedName qualified as S
 import Juvix.Compiler.Concrete.Language
 import Juvix.Compiler.Store.Scoped.Data.SymbolEntry
@@ -24,7 +25,7 @@ data InfoTable = InfoTable
     _infoInductives :: HashMap NameId (InductiveDef 'Scoped),
     _infoConstructors :: HashMap NameId (ConstructorDef 'Scoped),
     _infoAxioms :: HashMap NameId (AxiomDef 'Scoped),
-    _infoBuiltins :: HashMap BuiltinPrim S.Symbol,
+    _infoBuiltins :: BuiltinsTable,
     _infoScoperAlias :: HashMap S.NameId PreSymbolEntry
   }
   deriving stock (Generic)

src/Juvix/Formatter.hs

@@ -2,7 +2,6 @@
 
 module Juvix.Formatter where
 
-import Juvix.Compiler.Builtins.Effect
 import Juvix.Compiler.Concrete.Data.Highlight.Input (ignoreHighlightBuilder)
 import Juvix.Compiler.Concrete.Language
 import Juvix.Compiler.Concrete.Print (ppOutDefault)
@@ -110,8 +109,7 @@ formatModuleInfo ::
       '[ PathResolver,
          Error JuvixError,
          Files,
-         Reader Package,
-         Builtins
+         Reader Package
        ]
       r
   ) =>