fix repl

app/Commands/Repl.hs

@@ -31,6 +31,7 @@ import Juvix.Compiler.Internal.Language qualified as Internal
 import Juvix.Compiler.Internal.Pretty qualified as Internal
 import Juvix.Compiler.Pipeline.Repl
 import Juvix.Compiler.Pipeline.Run
+import Juvix.Compiler.Store.Extra
 import Juvix.Data.CodeAnn (Ann)
 import Juvix.Data.Error.GenericError qualified as Error
 import Juvix.Data.NameKind
@@ -255,6 +256,12 @@ replParseIdentifiers input =
             err :: Repl a
             err = replError (mkAnsiText @Text ":def expects one or more identifiers")
 
+getScopedInfoTable :: Repl Scoped.InfoTable
+getScopedInfoTable = do
+  artifs <- (^. replContextArtifacts) <$> replGetContext
+  let tab0 = artifs ^. artifactScopeTable
+  return $ tab0 <> computeCombinedScopedInfoTable (artifs ^. artifactModuleTable)
+
 printDocumentation :: String -> Repl ()
 printDocumentation = replParseIdentifiers >=> printIdentifiers
   where
@@ -263,9 +270,6 @@ printDocumentation = replParseIdentifiers >=> printIdentifiers
       printIdentifier d
       whenJust (nonEmpty ds) $ \ds' -> replNewline >> printIdentifiers ds'
       where
-        getInfoTable :: Repl Scoped.InfoTable
-        getInfoTable = (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
-
         printIdentifier :: Concrete.ScopedIden -> Repl ()
         printIdentifier s = do
           let n = s ^. Concrete.scopedIdenFinal . Scoped.nameId
@@ -291,25 +295,25 @@ printDocumentation = replParseIdentifiers >=> printIdentifiers
 
             getDocFunction :: Scoped.NameId -> Repl (Maybe (Concrete.Judoc 'Concrete.Scoped))
             getDocFunction fun = do
-              tbl :: Scoped.InfoTable <- getInfoTable
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def = tbl ^?! Scoped.infoFunctions . at fun . _Just
               return (def ^. Concrete.signDoc)
 
             getDocInductive :: Scoped.NameId -> Repl (Maybe (Concrete.Judoc 'Concrete.Scoped))
             getDocInductive ind = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def :: Concrete.InductiveDef 'Concrete.Scoped = tbl ^?! Scoped.infoInductives . at ind . _Just
               return (def ^. Concrete.inductiveDoc)
 
             getDocAxiom :: Scoped.NameId -> Repl (Maybe (Concrete.Judoc 'Concrete.Scoped))
             getDocAxiom ax = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def :: Concrete.AxiomDef 'Concrete.Scoped = tbl ^?! Scoped.infoAxioms . at ax . _Just
               return (def ^. Concrete.axiomDoc)
 
             getDocConstructor :: Scoped.NameId -> Repl (Maybe (Concrete.Judoc 'Concrete.Scoped))
             getDocConstructor c = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def = tbl ^?! Scoped.infoConstructors . at c . _Just
               return (def ^. Concrete.constructorDoc)
 
@@ -321,9 +325,6 @@ printDefinition = replParseIdentifiers >=> printIdentifiers
       printIdentifier d
       whenJust (nonEmpty ds) $ \ds' -> replNewline >> printIdentifiers ds'
       where
-        getInfoTable :: Repl Scoped.InfoTable
-        getInfoTable = (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
-
         printIdentifier :: Concrete.ScopedIden -> Repl ()
         printIdentifier s =
           let n = s ^. Concrete.scopedIdenFinal . Scoped.nameId
@@ -346,7 +347,7 @@ printDefinition = replParseIdentifiers >=> printIdentifiers
 
             printFunction :: Scoped.NameId -> Repl ()
             printFunction fun = do
-              tbl :: Scoped.InfoTable <- getInfoTable
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               case tbl ^. Scoped.infoFunctions . at fun of
                 Just def -> do
                   printLocation def
@@ -355,21 +356,21 @@ printDefinition = replParseIdentifiers >=> printIdentifiers
 
             printInductive :: Scoped.NameId -> Repl ()
             printInductive ind = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def :: Concrete.InductiveDef 'Concrete.Scoped = tbl ^?! Scoped.infoInductives . at ind . _Just
               printLocation def
               printConcreteLn def
 
             printAxiom :: Scoped.NameId -> Repl ()
             printAxiom ax = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let def :: Concrete.AxiomDef 'Concrete.Scoped = tbl ^?! Scoped.infoAxioms . at ax . _Just
               printLocation def
               printConcreteLn def
 
             printConstructor :: Scoped.NameId -> Repl ()
             printConstructor c = do
-              tbl :: Scoped.InfoTable <- (^. replContextArtifacts . artifactScopeTable) <$> replGetContext
+              tbl :: Scoped.InfoTable <- getScopedInfoTable
               let ind = tbl ^?! Scoped.infoConstructors . at c . _Just . Concrete.constructorInductiveName
               printInductive (ind ^. Scoped.nameId)
 

src/Juvix/Compiler/Pipeline/Artifacts.hs

@@ -27,6 +27,7 @@ appendArtifactsModuleTable :: ModuleTable -> Artifacts -> Artifacts
 appendArtifactsModuleTable mtab =
   over artifactInternalTypedTable (computeCombinedInfoTable importTab <>)
     . over (artifactCoreModule . Core.moduleImportsTable) (computeCombinedCoreInfoTable mtab <>)
+    . over artifactModuleTable (mtab <>)
   where
     importTab :: Internal.InternalModuleTable
     importTab = getInternalModuleTable mtab

src/Juvix/Compiler/Pipeline/Repl.hs

@@ -116,12 +116,13 @@ registerImport i = do
   let mtab' = Store.insertModule (i ^. importModulePath) mi mtab
   modify' (appendArtifactsModuleTable mtab')
   scopeTable <- gets (^. artifactScopeTable)
+  mtab'' <- gets (^. artifactModuleTable)
   void
     . runNameIdGenArtifacts
     . runBuiltinsArtifacts
     . runScoperScopeArtifacts
     . runStateArtifacts artifactScoperState
-    $ Scoper.scopeCheckImport (Store.getScopedModuleTable mtab') scopeTable i
+    $ Scoper.scopeCheckImport (Store.getScopedModuleTable mtab'') scopeTable i
 
 fromInternalExpression :: (Members '[State Artifacts] r) => Internal.Expression -> Sem r Core.Node
 fromInternalExpression exp = do

src/Juvix/Compiler/Store/Extra.hs

@@ -7,6 +7,7 @@ import Juvix.Compiler.Core.Data.InfoTable qualified as Core
 import Juvix.Compiler.Store.Core.Extra
 import Juvix.Compiler.Store.Internal.Language
 import Juvix.Compiler.Store.Language
+import Juvix.Compiler.Store.Scoped.Data.InfoTable qualified as Scoped
 import Juvix.Compiler.Store.Scoped.Language
 import Juvix.Prelude
 
@@ -34,6 +35,10 @@ lookupModule mtab n = fromJust $ HashMap.lookup n (mtab ^. moduleTable)
 insertModule :: TopModulePath -> ModuleInfo -> ModuleTable -> ModuleTable
 insertModule p mi = over moduleTable (HashMap.insert p mi)
 
+computeCombinedScopedInfoTable :: ModuleTable -> Scoped.InfoTable
+computeCombinedScopedInfoTable mtab =
+  mconcatMap (^. moduleInfoScopedModule . scopedModuleInfoTable) (HashMap.elems (mtab ^. moduleTable))
+
 computeCombinedCoreInfoTable :: ModuleTable -> Core.InfoTable
 computeCombinedCoreInfoTable mtab =
   mconcatMap (toCore . (^. moduleInfoCoreTable)) (HashMap.elems (mtab ^. moduleTable))