Load module when evaluating an expression

Author: HeinrichApfelmus

src/Eval.hs

@@ -4,56 +4,39 @@ module Eval
     ( RefRepl
     , initDisco
     , eval
+    , loadFile
     ) where
 
-import Control.Monad (forM_)
-import Disco.Module
-    ( Resolver (..)
-    , resolveModule
-    )
-import Disco.Names
-    ( ModuleProvenance
-    )
-import Polysemy
-    ( Embed
-    , Sem
-    , runM
-    )
 import System.Environment
 
-import Interpreter
-    ( Repl
-    , execute
-    , initial
-    )
+import qualified Interpreter
 import Data.IORef
 
 {-----------------------------------------------------------------------------
     Rendering Logic
 ------------------------------------------------------------------------------}
-type RefRepl = IORef Repl
+type RefRepl = IORef Interpreter.Repl
 
 eval :: RefRepl -> String -> IO String
 eval ref command = do
     repl0 <- readIORef ref
-    (result, repl1) <- execute command repl0
+    (result, repl1) <- Interpreter.execute command repl0
     writeIORef ref repl1
     pure result
 
-resolveModule'
-    :: Resolver -> String
-    -> Sem '[Embed IO] (Maybe (FilePath, ModuleProvenance))
-resolveModule' = resolveModule
+loadFile :: RefRepl -> String -> IO String
+loadFile ref s = do
+    writeFile "disco-live.disco" s
+    repl0 <- readIORef ref
+    (result, repl1) <-
+        Interpreter.execute (":load disco-live.disco") repl0
+    writeIORef ref repl1
+    pure result
 
 initDisco :: IO RefRepl
 initDisco = do
     -- NOTE: We set path environment variables here,
     -- because processing the .wasm module with `wizer` may bake
     -- them into the code.
     setEnv "disco_datadir" "stdlib"
-
-    -- Debug output
-    s <- runM $ resolveModule' FromStdlib "num"
-    print s
-
-    newIORef initial
+    newIORef Interpreter.initial

src/Main.hs

@@ -3,7 +3,7 @@ module Main where
 import Control.Monad (when)
 import GHC.Wasm.Prim
 
-import Eval (RefRepl, eval, initDisco)
+import Eval (RefRepl, eval, initDisco, loadFile)
 
 {-----------------------------------------------------------------------------
     JavaScript Imports
@@ -81,6 +81,8 @@ handleEval ref = do
     expr    <- fromJSString <$> js_input_value exprIn
 
     logHistory $ "disco> " <> expr
+    result <- loadFile ref module_
+    logHistory result
     result <- eval ref expr
     logHistory result