inline run to load

Author: xieyuheng

examples/tests/undefined-name.error.lisp.err

@@ -1,3 +1,3 @@
-[run] I find undefined name: g
+[load] I find undefined name: g
   defining: f
   body: (lambda (x) (g x))

src/commands/runCommand.ts

@@ -16,9 +16,14 @@ export const runCommand: Command = {
   },
 
   async run(commander) {
-    const url = createURL(String(commander.args[0]))
-
     try {
+      if (typeof commander.args[0] !== "string") {
+        throw new Error(
+          `[run] I expect the first argument to be a path, instead of: ${commander.args[0]}`,
+        )
+      }
+
+      const url = createURL(commander.args[0])
       await load(url)
     } catch (error) {
       if (error instanceof Error) {

src/lang/load/load.ts

@@ -1,9 +1,19 @@
 import { ParsingError } from "@xieyuheng/x-data.js"
 import fs from "node:fs"
-import { createMod, type Mod } from "../mod/index.ts"
+import { expFreeNames } from "../exp/expFreeNames.ts"
+import { formatExp } from "../format/formatExp.ts"
+import {
+  createMod,
+  modFind,
+  modOwnDefs,
+  type Def,
+  type Mod,
+} from "../mod/index.ts"
 import { parseStmts } from "../parse/index.ts"
 import { globalLoadedMods } from "./globalLoadedMods.ts"
-import { run } from "./run.ts"
+import { handleDefine } from "./handleDefine.ts"
+import { handleEffect } from "./handleEffect.ts"
+import { handleImport } from "./handleImport.ts"
 
 export async function load(url: URL): Promise<Mod> {
   const found = globalLoadedMods.get(url.href)
@@ -25,3 +35,29 @@ export async function load(url: URL): Promise<Mod> {
     throw error
   }
 }
+
+async function run(mod: Mod): Promise<void> {
+  if (mod.isFinished) return
+
+  for (const stmt of mod.stmts) await handleDefine(mod, stmt)
+  for (const stmt of mod.stmts) await handleImport(mod, stmt)
+  for (const def of modOwnDefs(mod).values()) assertAllNamesDefined(mod, def)
+  for (const stmt of mod.stmts) await handleEffect(mod, stmt)
+
+  mod.isFinished = true
+}
+
+function assertAllNamesDefined(mod: Mod, def: Def): void {
+  const freeNames = expFreeNames(new Set(), def.exp)
+  for (const name of freeNames) {
+    if (modFind(mod, name) === undefined) {
+      throw new Error(
+        [
+          `[load] I find undefined name: ${name}`,
+          `  defining: ${def.name}`,
+          `  body: ${formatExp(def.exp)}`,
+        ].join("\n"),
+      )
+    }
+  }
+}