run should be async

Author: xieyuheng

TODO.md

@@ -1,4 +1,3 @@
-`run` should be async
 call `run` in `load`
 rename `run/` to `load/`
 

src/commands/runCommand.ts

@@ -20,7 +20,7 @@ export const runCommand: Command = {
 
     try {
       const mod = await load(url)
-      run(mod)
+      await run(mod)
     } catch (error) {
       if (error instanceof Error) {
         console.error(error.message)

src/lang/run/handleDefine.ts

@@ -4,7 +4,7 @@ import { modDefine } from "../mod/index.ts"
 import type { Mod } from "../mod/Mod.ts"
 import type { Stmt } from "../stmt/Stmt.ts"
 
-export function handleDefine(mod: Mod, stmt: Stmt): void {
+export async function handleDefine(mod: Mod, stmt: Stmt): Promise<void> {
   if (stmt.kind === "Define") {
     const value = evaluate(mod, emptyEnv(), stmt.exp)
     if (value.kind === "Lambda") {

src/lang/run/handleEffect.ts

@@ -8,7 +8,7 @@ import { readback } from "../readback/index.ts"
 import { same } from "../same/index.ts"
 import type { Stmt } from "../stmt/Stmt.ts"
 
-export function handleEffect(mod: Mod, stmt: Stmt): void {
+export async function handleEffect(mod: Mod, stmt: Stmt): Promise<void> {
   if (stmt.kind === "AssertEqual") {
     if (
       equal(

src/lang/run/handleImport.ts

@@ -4,17 +4,21 @@ import type { ImportEntry, Stmt } from "../stmt/Stmt.ts"
 import { globalLoadedMods } from "./globalLoadedMods.ts"
 import { run } from "./run.ts"
 
-export function handleImport(mod: Mod, stmt: Stmt): void {
+export async function handleImport(mod: Mod, stmt: Stmt): Promise<void> {
   if (stmt.kind === "Import") {
     for (const entry of stmt.entries) {
-      importOne(mod, stmt.path, entry)
+      await importOne(mod, stmt.path, entry)
     }
 
     return
   }
 }
 
-function importOne(mod: Mod, path: string, entry: ImportEntry): void {
+async function importOne(
+  mod: Mod,
+  path: string,
+  entry: ImportEntry,
+): Promise<void> {
   const url = modResolve(mod, path)
   if (url.href === mod.url.href) {
     throw new Error(`I can not circular import: ${path}`)
@@ -25,7 +29,7 @@ function importOne(mod: Mod, path: string, entry: ImportEntry): void {
     throw new Error(`Mod is not loaded: ${path}`)
   }
 
-  run(found.mod)
+  await run(found.mod)
 
   const { name, rename } = entry
 

src/lang/run/run.ts

@@ -5,15 +5,15 @@ import { handleDefine } from "./handleDefine.ts"
 import { handleEffect } from "./handleEffect.ts"
 import { handleImport } from "./handleImport.ts"
 
-export function run(mod: Mod): void {
+export async function run(mod: Mod): Promise<void> {
   if (mod.isFinished) return
 
-  for (const stmt of mod.stmts) handleImport(mod, stmt)
-  for (const stmt of mod.stmts) handleDefine(mod, stmt)
+  for (const stmt of mod.stmts) await handleImport(mod, stmt)
+  for (const stmt of mod.stmts) await handleDefine(mod, stmt)
 
   for (const def of modOwnDefs(mod).values()) assertAllNamesDefined(mod, def)
 
-  for (const stmt of mod.stmts) handleEffect(mod, stmt)
+  for (const stmt of mod.stmts) await handleEffect(mod, stmt)
 
   mod.isFinished = true
 }