fix repl

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

@@ -28,9 +28,7 @@ typeCheckExpressionType ::
 typeCheckExpressionType exp = do
   -- TODO: refactor: modules outside of REPL should not refer to Artifacts
   table <- extendedTableReplArtifacts exp
-  runTypesTableArtifacts
-    . runFunctionsTableArtifacts
-    . runResultBuilderArtifacts
+  runResultBuilderArtifacts
     . runBuiltinsArtifacts
     . runNameIdGenArtifacts
     . ignoreHighlightBuilder
@@ -88,5 +86,7 @@ typeCheckingNew a = do
         _resultInternalModule = md,
         _resultTermination = termin,
         _resultIdenTypes = bst ^. resultBuilderStateCombinedTypesTable,
-        _resultFunctions = bst ^. resultBuilderStateCombinedFunctionsTable
+        _resultFunctions = bst ^. resultBuilderStateCombinedFunctionsTable,
+        _resultInstances = bst ^. resultBuilderStateCombinedInstanceTable,
+        _resultCoercions = bst ^. resultBuilderStateCombinedCoercionTable
       }

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

@@ -5,12 +5,16 @@ module Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking
     module Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Data.ResultBuilder,
     module Juvix.Compiler.Store.Internal.Data.FunctionsTable,
     module Juvix.Compiler.Store.Internal.Data.TypesTable,
+    module Juvix.Compiler.Store.Internal.Data.InstanceInfo,
+    module Juvix.Compiler.Store.Internal.Data.CoercionInfo,
   )
 where
 
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.CheckerNew
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Data.Context
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Data.Inference
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Data.ResultBuilder
+import Juvix.Compiler.Store.Internal.Data.CoercionInfo
 import Juvix.Compiler.Store.Internal.Data.FunctionsTable
+import Juvix.Compiler.Store.Internal.Data.InstanceInfo
 import Juvix.Compiler.Store.Internal.Data.TypesTable

src/Juvix/Compiler/Internal/Translation/FromInternal/Analysis/TypeChecking/Data/Context.hs

@@ -22,7 +22,9 @@ data InternalTypedResult = InternalTypedResult
     _resultInternalModule :: InternalModule,
     _resultTermination :: TerminationState,
     _resultIdenTypes :: TypesTable,
-    _resultFunctions :: FunctionsTable
+    _resultFunctions :: FunctionsTable,
+    _resultInstances :: InstanceTable,
+    _resultCoercions :: CoercionTable
   }
 
 data ImportContext = ImportContext

src/Juvix/Compiler/Pipeline/Artifacts.hs

@@ -68,9 +68,6 @@ runNameIdGenArtifacts ::
   Sem r a
 runNameIdGenArtifacts = runStateLikeArtifacts runNameIdGen artifactNameIdState
 
-runFunctionsTableArtifacts :: (Members '[State Artifacts] r) => Sem (State FunctionsTable ': r) a -> Sem r a
-runFunctionsTableArtifacts = runStateArtifacts artifactFunctions
-
 readerFunctionsTableArtifacts :: (Members '[State Artifacts] r) => Sem (Reader FunctionsTable ': r) a -> Sem r a
 readerFunctionsTableArtifacts = runReaderArtifacts artifactFunctions
 
@@ -80,9 +77,6 @@ readerTypesTableArtifacts = runReaderArtifacts artifactTypes
 runTerminationArtifacts :: (Members '[Error JuvixError, State Artifacts] r) => Sem (Termination ': r) a -> Sem r a
 runTerminationArtifacts = runStateLikeArtifacts runTermination artifactTerminationState
 
-runTypesTableArtifacts :: (Members '[State Artifacts] r) => Sem (State TypesTable ': r) a -> Sem r a
-runTypesTableArtifacts = runStateArtifacts artifactTypes
-
 runStateArtifacts :: (Members '[State Artifacts] r) => Lens' Artifacts f -> Sem (State f ': r) a -> Sem r a
 runStateArtifacts = runStateLikeArtifacts runState
 
@@ -107,14 +101,18 @@ runResultBuilderArtifacts :: forall r a. (Members '[State Artifacts] r) => Sem (
 runResultBuilderArtifacts m = do
   ftab <- gets (^. artifactFunctions)
   ttab <- gets (^. artifactTypes)
+  itab <- gets (^. artifactInstances)
+  ctab <- gets (^. artifactCoercions)
   let importCtx =
         ImportContext
-          { _importContextCoercions = mempty,
-            _importContextInstances = mempty,
+          { _importContextCoercions = ctab,
+            _importContextInstances = itab,
             _importContextFunctionsTable = ftab,
             _importContextTypesTable = ttab
           }
   (s, a) <- runResultBuilder importCtx m
   modify' (set artifactFunctions (s ^. resultBuilderStateCombinedFunctionsTable))
   modify' (set artifactTypes (s ^. resultBuilderStateCombinedTypesTable))
+  modify' (set artifactInstances (s ^. resultBuilderStateCombinedInstanceTable))
+  modify' (set artifactCoercions (s ^. resultBuilderStateCombinedCoercionTable))
   return a

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

@@ -9,6 +9,8 @@ import Juvix.Compiler.Internal.Translation.FromConcrete qualified as Internal
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.Termination.Checker
 import Juvix.Compiler.Internal.Translation.FromInternal.Analysis.TypeChecking.Data.Context
 import Juvix.Compiler.Pipeline.Loader.PathResolver.Data
+import Juvix.Compiler.Store.Internal.Data.CoercionInfo
+import Juvix.Compiler.Store.Internal.Data.InstanceInfo
 import Juvix.Compiler.Store.Language qualified as Store
 import Juvix.Prelude
 
@@ -29,6 +31,8 @@ data Artifacts = Artifacts
     -- Typechecking
     _artifactTypes :: TypesTable,
     _artifactFunctions :: FunctionsTable,
+    _artifactInstances :: InstanceTable,
+    _artifactCoercions :: CoercionTable,
     -- | This includes the InfoTable from all type checked modules
     _artifactInternalTypedTable :: Internal.InfoTable,
     -- Core

src/Juvix/Compiler/Pipeline/Run.hs

@@ -193,6 +193,12 @@ runReplPipelineIOEither' lockMode entry = do
           functionsTable :: Typed.FunctionsTable
           functionsTable = typedResult ^. Typed.resultFunctions
 
+          instanceTable :: Typed.InstanceTable
+          instanceTable = typedResult ^. Typed.resultInstances
+
+          coercionTable :: Typed.CoercionTable
+          coercionTable = typedResult ^. Typed.resultCoercions
+
           typedTable :: Internal.InfoTable
           typedTable = typedResult ^. Typed.resultInternalModule . Typed.internalModuleInfoTable
 
@@ -226,6 +232,8 @@ runReplPipelineIOEither' lockMode entry = do
                   _artifactScopeExports = scopedResult ^. Scoped.resultExports,
                   _artifactTypes = typesTable,
                   _artifactFunctions = functionsTable,
+                  _artifactInstances = instanceTable,
+                  _artifactCoercions = coercionTable,
                   _artifactScoperState = scopedResult ^. Scoped.resultScoperState,
                   _artifactResolver = art ^. artifactResolver,
                   _artifactBuiltins = art ^. artifactBuiltins,
@@ -244,6 +252,8 @@ runReplPipelineIOEither' lockMode entry = do
           _artifactNameIdState = genNameIdState defaultModuleId,
           _artifactTypes = mempty,
           _artifactFunctions = mempty,
+          _artifactInstances = mempty,
+          _artifactCoercions = mempty,
           _artifactCoreModule = Core.emptyModule,
           _artifactScopeTable = mempty,
           _artifactBuiltins = iniBuiltins,