feat: connect source compilation and VM execution
Verify databases and deploy Aster VM / verify-and-deploy (push) Successful in 7m56s

This commit is contained in:
2026-10-19 14:50:37 +08:00
parent f5268d2e09
commit aa3257bfe6
45 changed files with 1501 additions and 44 deletions
+1
View File
@@ -10,6 +10,7 @@ name = "cli"
path = "src/main.rs"
[dependencies]
compiler.workspace = true
core.workspace = true
frontend.workspace = true
host.workspace = true
+5 -5
View File
@@ -1,11 +1,11 @@
# cli
同步命令行宿主,提供 bootstrap、parse、help 和文件 metadata 命令。bootstrap 演示两个运行时对象并释放,不读取数据库配置、不连接或写入数据库。
同步命令行宿主,提供 bootstrap、parse、run、eval、help 和文件 metadata 命令。bootstrap 演示两个运行时对象并释放,不读取数据库配置、不连接或写入数据库。
| 内容 | 职责 |
| --- | --- |
| Cargo.toml | cli 二进制与 core/frontend/host 依赖;无 storage 或 Tokio 依赖 |
| [src](src/README.md) | 参数路由、引导演示、文件/stdin 阅读、源码解析和退出码 |
| [tests](tests/README.md) | parse 命令的 AST/JSON 输出、解析模式、错误位置和严格 UTF-8 检查 |
| Cargo.toml | cli 二进制与 compiler/core/frontend/host 依赖;无 storage 或 Tokio 依赖 |
| [src](src/README.md) | 参数路由、引导演示、文件/stdin 阅读、源码解析/执行和退出码 |
| [tests](tests/README.md) | parse 的 AST/JSON 与 run/eval 的文件/stdin 执行、错误和退出码 |
运行方式见 [运行指南](../../docs/operations/README.md),输入边界见 [配置](../../docs/operations/configuration.md)。parse 通过 EndorReader 严格读取 UTF-8 文件或 `-` 指定的 stdin 并输出 AstRoot;--mode 选择 module/expression/interactive,--json 输出带 schema 的 AST JSON,不执行源码,见 [前端](../../docs/runtime/frontend.md);metadata put/get 和只导入缺失项的 import 均使用文件,见 [宿主信息](../../docs/operations/host-information.md)。返回 [工作区](../README.md)。
运行方式见 [运行指南](../../docs/operations/README.md),输入边界见 [配置](../../docs/operations/configuration.md)。parse 通过 EndorReader 严格读取 UTF-8 文件或 `-` 指定的 stdin 并输出 AstRoot;--mode 选择 module/expression/interactive,--json 输出带 schema 的 AST JSON,不执行源码,见 [前端](../../docs/runtime/frontend.md);run 调用模块的无参数入口(默认 main),eval 执行独立表达式,见 [编译链路](../../docs/runtime/compiler.md);metadata put/get 和只导入缺失项的 import 均使用文件,见 [宿主信息](../../docs/operations/host-information.md)。返回 [工作区](../README.md)。
+3 -1
View File
@@ -1,7 +1,9 @@
# CLI 入口
[main.rs](main.rs) 是唯一入口:同步 main 将 run 的结果转成进程退出码;run 处理 bootstrap、parse 文件/stdin、help、文件 metadata put/get/import,错误打印到 stderr 并返回失败。
[main.rs](main.rs) 是二进制入口:同步 main 将 run 的结果转成进程退出码;run 路由 bootstrap、parse、源码 run/eval、help、文件 metadata put/get/import,错误打印到 stderr 并返回失败。
bootstrap 创建并显式释放两个对象,不读取数据库环境、不打开数据库。parse_command 使用 EndorReader 和 parse_source_ast 输出 AstRoot;--mode 选择 module/expression/interactive(默认 module),--json 通过 AstDocument 输出 JSON,格式见 [AST 模型](../../../docs/runtime/ast.md);`-` 从 stdin 读到 EOF,来源为 `<stdin>`。词法/语法错误显示来源、行、列;不创建 VM 或执行源码。未知命令报错;metadata 通过 host::MetadataStore 读写文件,import 从标准输入接收旧记录且不覆盖已有文件。参数目前由 std::env::args 读取,非 Unicode 参数可能 panic,边界见 [配置](../../../docs/operations/configuration.md)。
[execute.rs](execute.rs) 负责 run/eval 的文件/stdin 阅读、调用 compiler、创建 VM/globals、模块初始化与入口调用、结果格式化、traceback 和成功/失败后的根释放;命名空间由 CLI 自己创建并清空,见 [编译契约](../../../docs/runtime/compiler.md)。
新增命令时更新用法、[运行指南](../../../docs/operations/README.md) 和 [smoke.py 的导航](../../../scripts/README.md)。返回 [cli](../README.md)。
+105
View File
@@ -0,0 +1,105 @@
use std::error::Error;
use compiler::{CompileOptions, compile_source};
use endor_core::{Value, Vm};
use frontend::{EndorReader, ParseMode, SourceUnit};
pub(super) fn run_command(arguments: &[&str]) -> Result<(), Box<dyn Error>> {
let mut entry = "main";
let mut path = None;
let mut arguments = arguments.iter().copied();
while let Some(argument) = arguments.next() {
match argument {
"--entry" => {
entry = arguments
.next()
.filter(|name| !name.is_empty() && !name.starts_with("--"))
.ok_or(super::USAGE)?;
}
value if !value.starts_with("--") && path.is_none() => path = Some(value),
_ => return Err(super::USAGE.into()),
}
}
let source = read(path.ok_or(super::USAGE)?)?;
let output = execute(&source, ParseMode::Module, Some(entry))?;
println!("{output}");
Ok(())
}
pub(super) fn eval_command(path: &str) -> Result<(), Box<dyn Error>> {
let source = read(path)?;
let output = execute(&source, ParseMode::Expression, None)?;
println!("{output}");
Ok(())
}
fn read(path: &str) -> Result<SourceUnit, Box<dyn Error>> {
Ok(if path == "-" {
EndorReader::from_stream("<stdin>", std::io::stdin().lock())?
} else {
EndorReader::from_file(path)?
})
}
fn execute(
source: &SourceUnit,
mode: ParseMode,
entry: Option<&str>,
) -> Result<String, Box<dyn Error>> {
let compiled = compile_source(source, mode, &CompileOptions::default())?;
let mut vm = Vm::new()?;
let code = compiled.load(&mut vm)?;
let globals = match vm.new_dict() {
Ok(globals) => globals,
Err(error) => {
vm.release(code)?;
return Err(error.into());
}
};
let result = (|| -> Result<String, Box<dyn Error>> {
let mut value = vm.execute(code, globals)?;
if let Some(entry) = entry {
vm.release_value(value)?;
let Some(Value::Object(function)) = vm.dict_get(globals, &Value::Text(entry.into()))?
else {
return Err(format!("entry function not found: {entry}").into());
};
value = vm.call(function, &[])?;
}
let output = format_value(&vm, &value);
vm.release_value(value)?;
output
})();
// Copy traceback metadata before cleanup. This is the entry location of
// each code object plus bytecode offset, not a per-instruction source map.
let result = result.map_err(|error| {
let mut message = format!("{}: {error}", source.origin());
for location in vm.last_traceback() {
message.push_str(&format!(
"\n at {} ({}:{}, code unit {})",
location.function,
location.filename,
location.first_line,
location.instruction_offset
));
}
Box::<dyn Error>::from(message)
});
vm.release(code)?;
// CLI owns this fresh namespace. Clearing it breaks function↔globals
// cycles on both success and failure; embedders choose their own lifetime.
vm.dict_clear(globals)?;
vm.release(globals)?;
vm.collect_cycles();
result
}
fn format_value(vm: &Vm, value: &Value) -> Result<String, Box<dyn Error>> {
Ok(match value {
Value::Nil => "nil".into(),
Value::Bool(value) => value.to_string(),
Value::Text(value) => value.clone(),
Value::Number(value) => value.to_string(),
Value::Object(reference) => vm.str(*reference)?,
})
}
+5 -1
View File
@@ -6,7 +6,9 @@ use frontend::ast::AstDocument;
use frontend::{EndorReader, ParseMode, parse_source_ast};
use host::MetadataStore;
const USAGE: &str = "Usage: cli [bootstrap | parse [--mode module|expression|interactive] [--json] <file|-> | metadata put <key> <value> | metadata get <key> | metadata import | help]";
mod execute;
const USAGE: &str = "Usage: cli [bootstrap | run [--entry name] <file|-> | eval <file|-> | parse [--mode module|expression|interactive] [--json] <file|-> | metadata put <key> <value> | metadata get <key> | metadata import | help]";
fn main() -> ExitCode {
match run() {
@@ -48,6 +50,8 @@ fn run() -> Result<(), Box<dyn Error>> {
}
["help"] | ["--help"] | ["-h"] => println!("{USAGE}"),
["parse", arguments @ ..] => parse_command(arguments)?,
["run", arguments @ ..] => execute::run_command(arguments)?,
["eval", path] => execute::eval_command(path)?,
["metadata", "put", key, value] => {
MetadataStore::from_env()?.put(key, value)?;
println!("stored (file)");
+2
View File
@@ -2,4 +2,6 @@
[parse.rs](parse.rs) 使用 Cargo 提供的 cli 测试二进制检查 parse 命令:合法 UTF-8 源码输出 AST 且不执行名称调用;非法语法输出文件/行/列并返回失败;非法 UTF-8 不替换字符;`parse -` 检查 stdin 输入、EOF 和带流名的错误;--json/--mode 检查表达式与交互根、schema 标识以及非法模式退出。
[execute.rs](execute.rs) 检查 compiler/examples 中的真实 Endor 文件、run/eval、显式入口、stdin、运行时 traceback、名称/编译/语法/UTF-8 错误和无成功输出的失败退出。
测试仅在 ces-control 的工作区检查中运行,本地不执行。测试临时文件使用独立名称并在结束时清理。返回 [cli](../README.md),验证约定见 [验证](../../../docs/operations/validation.md)。
+136
View File
@@ -0,0 +1,136 @@
use std::io::Write;
use std::process::{Command, Output, Stdio};
fn stdin_command(arguments: &[&str], source: &[u8]) -> Output {
let mut child = Command::new(env!("CARGO_BIN_EXE_cli"))
.args(arguments)
.stdin(Stdio::piped())
.stdout(Stdio::piped())
.stderr(Stdio::piped())
.spawn()
.unwrap();
child.stdin.take().unwrap().write_all(source).unwrap();
child.wait_with_output().unwrap()
}
#[test]
fn run_executes_real_endor_files_and_prints_entry_results() {
for (file, expected) in [
("hello.endor", "你好,Endor 🌱\n"),
("calls.endor", "函数调用已接通\n"),
("shadowing.endor", "局部名称优先\n"),
("number.endor", "-123456789012345678901234567890.00100\n"),
] {
let path = std::path::Path::new(env!("CARGO_MANIFEST_DIR"))
.join("../compiler/examples")
.join(file);
let output = Command::new(env!("CARGO_BIN_EXE_cli"))
.arg("run")
.arg(path)
.output()
.unwrap();
assert!(
output.status.success(),
"{}",
String::from_utf8_lossy(&output.stderr)
);
assert_eq!(String::from_utf8(output.stdout).unwrap(), expected);
assert!(output.stderr.is_empty());
}
}
#[test]
fn eval_and_run_read_stdin_and_support_explicit_entry_names() {
let output = stdin_command(&["eval", "-"], "\"表达式🌱\"".as_bytes());
assert!(
output.status.success(),
"{}",
String::from_utf8_lossy(&output.stderr)
);
assert_eq!(String::from_utf8(output.stdout).unwrap(), "表达式🌱\n");
let output = stdin_command(
&["run", "--entry", "greet", "-"],
b"function greet(): String { return \"ok\" }",
);
assert!(
output.status.success(),
"{}",
String::from_utf8_lossy(&output.stderr)
);
assert_eq!(String::from_utf8(output.stdout).unwrap(), "ok\n");
let path =
std::path::Path::new(env!("CARGO_MANIFEST_DIR")).join("../compiler/examples/literal.endor");
let output = Command::new(env!("CARGO_BIN_EXE_cli"))
.arg("eval")
.arg(path)
.output()
.unwrap();
assert!(output.status.success());
assert_eq!(
String::from_utf8(output.stdout).unwrap(),
"表达式 → 字节码 → VM\n"
);
}
#[test]
fn execution_errors_fail_without_success_output_and_report_their_stage() {
for (arguments, source, expected) in [
(
vec!["run", "-"],
"function main(): T {\n return missing\n}",
"<stdin>:2:10: undefined name: missing",
),
(
vec!["run", "-"],
"function main(): T { return f() } function f(x: T): T { return x }",
"positional arguments",
),
(
vec!["run", "-"],
"function other(): T { return 1 }",
"entry function not found: main",
),
(
vec!["eval", "-"],
"1 + 2",
"arithmetic bytecode is not implemented",
),
(vec!["eval", "-"], "1()", "does not support call"),
(
vec!["run", "-"],
"function main(): T { return ) }",
"expected",
),
] {
let output = stdin_command(&arguments, source.as_bytes());
assert!(!output.status.success());
assert!(output.stdout.is_empty());
let error = String::from_utf8(output.stderr).unwrap();
assert!(error.contains(expected), "{error}");
if expected == "positional arguments" {
assert!(error.contains("at main (<stdin>:1, code unit"));
}
}
let output = stdin_command(&["eval", "-"], &[0xff]);
assert!(!output.status.success());
assert!(
String::from_utf8(output.stderr)
.unwrap()
.contains("invalid UTF-8")
);
for arguments in [
vec!["run"],
vec!["run", "--entry"],
vec!["run", "--unknown", "-"],
vec!["eval"],
vec!["eval", "-", "extra"],
] {
let output = Command::new(env!("CARGO_BIN_EXE_cli"))
.args(arguments)
.output()
.unwrap();
assert!(!output.status.success());
assert!(output.stdout.is_empty());
assert!(String::from_utf8(output.stderr).unwrap().contains("Usage:"));
}
}