Add explicit managed traits and inherited method arity contracts

This commit is contained in:
2026-10-21 21:34:46 +08:00
parent b7daabdaad
commit eb60212428
16 changed files with 454 additions and 16 deletions
+1 -1
View File
@@ -7,7 +7,7 @@
| [runtime.rs](runtime.rs) | 空堆启动、默认操作、引用/借用、属性原子性、稳定地址、长链/循环、原生回调、VM 销毁 |
| [builtins.rs](builtins.rs) | 无损 Number、Unicode 字符串、Dict 顺序与键、Cell、函数环境/共享代码、异常数据 |
| [execution.rs](execution.rs) | wordcode 与校验、控制流、参数/默认值、嵌套帧、字节码函数创建/默认值/环境捕获、闭包、返回值存活、失败清理、限额 |
| [types.rs](types.rs) | 名义身份、继承与实例关系、类型边保活/循环回收、只读类型元数据与外来句柄;仅远端执行 |
| [types.rs](types.rs) | 名义身份、继承与实例关系、类型边保活/循环回收、只读类型元数据与外来句柄、显式Trait身份/继承/参数约束及后代更新原子性;仅远端执行 |
| [native_context.rs](native_context.rs) | 原生作用域根、分配失败清理、委托、只读结果分配/写入拒绝/依赖与失败恢复、弱引用过期及有界变更;仅远端执行 |
核心对象现由 objects 定义,本目录保留既有 endor_core 导入与 Vm 方法的兼容性检查。独立对象存储检查见 [objects/tests](../../objects/tests/README.md)。堆内部伪造句柄与计数溢出检查在 objects 的 src/heap.rs,公开示例由 src/lib.rs rustdoc 提供。文件职责见 [src](../src/README.md),检查方式和结果边界见 [验证](../../../docs/operations/validation.md)。本地不执行测试;存在测试文件不代表某次提交已通过。返回 [core](../README.md)。
+135
View File
@@ -63,3 +63,138 @@ fn foreign_type_edges_fail_without_changing_the_target() {
);
assert_eq!(second.type_of(object).unwrap(), None);
}
fn contract_method(vm: &mut Vm, parameters: usize) -> endor_core::ObjectRef {
use endor_core::{CodeLayout, EndorCode, EndorCodeObject, Instruction, Opcode};
let names: Vec<_> = (0..parameters).map(|index| format!("arg{index}")).collect();
let code = EndorCode::from_instructions(
&[
Instruction::new(Opcode::LoadConst, 0),
Instruction::simple(Opcode::ReturnValue),
],
vec![Value::Nil],
CodeLayout {
parameters: names.clone(),
locals: names,
..CodeLayout::default()
},
)
.unwrap();
let code = vm.allocate(EndorCodeObject::new(code)).unwrap();
let globals = vm.new_dict().unwrap();
let function = vm
.new_function("contract method", code, globals, vec![], vec![])
.unwrap();
vm.release(code).unwrap();
vm.release(globals).unwrap();
function
}
#[test]
fn explicit_traits_inherit_validate_overrides_and_own_definition_edges() {
use endor_core::MethodRequirement;
let mut vm = Vm::new().unwrap();
let roots = vm.bootstrap_types().unwrap();
let base = vm
.new_type("Base", roots.object, TypeConstructor::Record)
.unwrap();
let valid = contract_method(&mut vm, 2);
let invalid = contract_method(&mut vm, 1);
vm.define_method(base, "render", valid).unwrap();
let capability = vm
.new_trait(
"Drawable",
vec![MethodRequirement {
name: "render".into(),
parameters: 1,
}],
)
.unwrap();
let same_name = vm.new_trait("Drawable", vec![]).unwrap();
assert!(!vm.implements_trait(base, capability).unwrap());
vm.implement_trait(base, capability).unwrap();
assert!(!vm.implements_trait(base, same_name).unwrap());
let child = vm
.new_class("Child", base, vec![], std::collections::BTreeMap::new())
.unwrap();
assert!(vm.implements_trait(child, capability).unwrap());
assert!(matches!(
vm.define_method(base, "render", invalid),
Err(VmError::TraitViolation { .. })
));
assert_eq!(
vm.object_store().lookup_method(base, "render").unwrap(),
Some(valid)
);
assert!(
vm.new_class("Bad", base, vec![], [("render".into(), invalid)].into())
.is_err()
);
let Value::Object(instance) = vm.call(child, &[]).unwrap() else {
panic!("instance required");
};
vm.release(capability).unwrap();
assert!(vm.supports(instance, capability).unwrap());
assert!(vm.replace_payload(capability, endor_core::Record).is_err());
for object in [
roots.object,
roots.type_type,
base,
child,
valid,
invalid,
same_name,
instance,
] {
vm.release(object).unwrap();
}
vm.collect_cycles();
assert_eq!(vm.object_count(), 0);
}
#[test]
fn late_trait_registration_and_ancestor_updates_validate_existing_descendants() {
use endor_core::MethodRequirement;
let mut vm = Vm::new().unwrap();
let roots = vm.bootstrap_types().unwrap();
let base = vm
.new_type("Base", roots.object, TypeConstructor::Record)
.unwrap();
let good = contract_method(&mut vm, 2);
let bad = contract_method(&mut vm, 1);
vm.define_method(base, "render", good).unwrap();
let child = vm
.new_class("Child", base, vec![], [("render".into(), bad)].into())
.unwrap();
let capability = vm
.new_trait(
"Drawable",
vec![MethodRequirement {
name: "render".into(),
parameters: 1,
}],
)
.unwrap();
assert!(vm.implement_trait(base, capability).is_err());
assert!(!vm.implements_trait(base, capability).unwrap());
vm.define_method(child, "render", good).unwrap();
let inheriting = vm
.new_class(
"Inheriting",
base,
vec![],
std::collections::BTreeMap::new(),
)
.unwrap();
vm.implement_trait(inheriting, capability).unwrap();
assert!(vm.define_method(base, "render", bad).is_err());
assert_eq!(
vm.object_store().lookup_method(base, "render").unwrap(),
Some(good)
);
let foreign = Vm::new().unwrap();
assert_eq!(
foreign.implements_trait(base, capability),
Err(VmError::ForeignHandle)
);
}