Represent nullable and union native contracts with traced alternatives

This commit is contained in:
2026-10-22 14:00:48 +08:00
parent 680caf81e3
commit 6b4cce1fee
12 changed files with 229 additions and 81 deletions
+1 -1
View File
@@ -4,7 +4,7 @@
| 文件 | 职责 |
| --- | --- |
| [lib.rs](lib.rs) | VM 类型导出、objects 类型兼容重导出(含 ReadAccess/CallSignature/CallEffect)、宿主调用与字节码 rustdoc 示例 |
| [lib.rs](lib.rs) | VM 类型导出、objects 类型兼容重导出(含 ReadAccess/CallSignature/CallType/CallEffect)、宿主调用与字节码 rustdoc 示例 |
| [vm.rs](vm.rs) | Vm 拥有 ObjectStore 与错误位置记录;对象操作和宿主 new_class 和显式Trait注册/关系查询显式委托给 objects;函数/字段检查统一开关、统一参数区间查询与函数类型配置 |
| [frame.rs](frame.rs) | EndorFrame、栈条目、源码与原生委托返回契约执行根、执行位置元数据、ExecutionLimits |
| [eval.rs](eval.rs) | execute/call、只读调用与依赖结果、参数绑定、原生实现前数量/类型/效果检查和委托返回检查、可选注解检查、源码类字段环境绑定、帧切换、取指分派、MakeFunction、结果根转移与失败清理 |
+11 -4
View File
@@ -313,14 +313,21 @@ impl Vm {
}
*executed += 1;
if let Some(signature) = self.objects.native_signature(function)?
&& !matches!(signature.returns, crate::AnnotationType::Any)
&& !signature.returns.is_any()
{
let check = NativeReturn {
name: self.object(function)?.payload().kind_name().into(),
expected: signature.returns,
};
if let Some(reference) = check.expected.reference() {
self.retain(reference)?;
let mut retained = Vec::new();
for reference in check.expected.references() {
if let Err(error) = self.retain(reference) {
for reference in retained {
self.release(reference)?;
}
return Err(error);
}
retained.push(reference);
}
returns.push(check);
}
@@ -363,7 +370,7 @@ impl Vm {
fn clear_native_returns(&mut self, returns: Vec<NativeReturn>) {
for check in returns {
if let Some(reference) = check.expected.reference() {
for reference in check.expected.references() {
self.release(reference)
.expect("native return check owns its type");
}
+3 -10
View File
@@ -13,19 +13,12 @@ pub(crate) enum StackEntry {
#[derive(Debug)]
pub(crate) struct NativeReturn {
pub name: String,
pub expected: crate::AnnotationType,
pub expected: crate::CallType,
}
impl NativeReturn {
pub fn check(&self, store: &objects::ObjectStore, value: &Value) -> Result<(), crate::VmError> {
if !store.matches_annotation(value, self.expected)? {
return Err(crate::VmError::TypeMismatch {
function: self.name.clone(),
position: "return".into(),
expected: store.annotation_type_name(self.expected)?,
actual: store.value_type_name(value)?,
});
}
Ok(())
self.expected
.check(store, &self.name, "return".into(), value)
}
}
+1 -1
View File
@@ -50,7 +50,7 @@ pub use objects::{
TypeConstructor,
};
pub use objects::{
CallArity, CallEffect, CallSignature, ChangeBatch, ChangeKey, CodeLayout, CompareOp,
CallArity, CallEffect, CallSignature, CallType, ChangeBatch, ChangeKey, CodeLayout, CompareOp,
ContextNativeFunction, DecodedInstruction, EndorBaseExceptionObject, EndorCellObject,
EndorCode, EndorCodeObject, EndorDecimal, EndorDictObject, EndorFunctionObject, EndorInteger,
EndorNativeCall, EndorNativeFunctionObject, EndorNumber, EndorNumberObject, EndorObject,