Add typed trait requirements and enforce actual capability results
This commit is contained in:
@@ -5,9 +5,9 @@
|
||||
| 文件 | 职责 |
|
||||
| --- | --- |
|
||||
| [lib.rs](lib.rs) | VM 类型导出、objects 类型兼容重导出(含 ReadAccess/CallSignature/CallType/CallEffect)、宿主调用与字节码 rustdoc 示例 |
|
||||
| [vm.rs](vm.rs) | Vm 拥有 ObjectStore 与错误位置记录;对象操作和宿主 new_class 和显式Trait注册/关系查询显式委托给 objects;函数/字段检查统一开关、统一参数区间查询与函数类型配置 |
|
||||
| [vm.rs](vm.rs) | Vm 拥有 ObjectStore 与错误位置记录;对象操作和宿主 new_class 和显式/类型化Trait注册/关系查询显式委托给 objects;函数/字段检查统一开关、统一参数区间查询与函数类型配置 |
|
||||
| [frame.rs](frame.rs) | EndorFrame、栈条目、源码与原生委托返回契约执行根、执行位置元数据、ExecutionLimits |
|
||||
| [eval.rs](eval.rs) | execute/call、只读调用与依赖结果、参数绑定、原生实现前数量/类型/效果检查和委托返回检查、可选注解/动态覆写兼容检查、源码类字段环境绑定、帧切换、取指分派、MakeFunction、结果根转移与失败清理 |
|
||||
| [eval.rs](eval.rs) | execute/call、只读调用与依赖结果、参数绑定、原生实现前数量/类型/效果检查和原生/类型化Trait委托返回检查、可选注解/动态覆写兼容检查、源码类字段环境绑定、帧切换、取指分派、MakeFunction、结果根转移与失败清理 |
|
||||
|
||||
## 常见修改入口
|
||||
|
||||
|
||||
+45
-21
@@ -179,14 +179,14 @@ impl Vm {
|
||||
Value::Object(receiver) => Some(*receiver),
|
||||
_ => None,
|
||||
});
|
||||
if self.source_type_checks
|
||||
&& let Some(receiver) = receiver
|
||||
{
|
||||
let typed_method = if let Some(receiver) = receiver {
|
||||
self.objects
|
||||
.check_method_override_call(function, receiver)?;
|
||||
}
|
||||
.check_method_contract_call(function, receiver, self.source_type_checks)?
|
||||
} else {
|
||||
false
|
||||
};
|
||||
let mut return_type = None;
|
||||
if self.source_type_checks
|
||||
if (self.source_type_checks || typed_method)
|
||||
&& let Some(signature) = executable.source_signature()
|
||||
{
|
||||
for (index, expected_name) in signature.parameters.iter().enumerate() {
|
||||
@@ -234,6 +234,14 @@ impl Vm {
|
||||
executable,
|
||||
};
|
||||
let initialized = (|| -> Result<(), VmError> {
|
||||
if let Some(receiver) = receiver {
|
||||
for (name, expected) in self.objects.method_trait_returns(function, receiver)? {
|
||||
self.push_native_return(
|
||||
&mut frame.native_returns,
|
||||
NativeReturn { name, expected },
|
||||
)?;
|
||||
}
|
||||
}
|
||||
let defaults = data.defaults().iter().skip(arguments.len() - required);
|
||||
for (slot, value) in frame
|
||||
.localsplus
|
||||
@@ -277,11 +285,12 @@ impl Vm {
|
||||
for argument in arguments {
|
||||
self.validate_value(argument)?;
|
||||
}
|
||||
if self.source_type_checks
|
||||
&& let Some(Value::Object(receiver)) = arguments.first()
|
||||
{
|
||||
self.objects
|
||||
.check_method_override_call(function, *receiver)?;
|
||||
if let Some(Value::Object(receiver)) = arguments.first() {
|
||||
self.objects.check_method_contract_call(
|
||||
function,
|
||||
*receiver,
|
||||
self.source_type_checks,
|
||||
)?;
|
||||
}
|
||||
if let Some(arity) = self.objects.call_arity(function)?
|
||||
&& !arity.accepts(arguments.len())
|
||||
@@ -326,7 +335,9 @@ impl Vm {
|
||||
.is::<EndorFunctionObject>()
|
||||
{
|
||||
let mut frame = self.prepare_frame(function, &arguments)?;
|
||||
let mut local = std::mem::take(&mut frame.native_returns);
|
||||
frame.native_returns = std::mem::take(&mut returns);
|
||||
frame.native_returns.append(&mut local);
|
||||
return Ok(PreparedCall::Frame(frame));
|
||||
}
|
||||
if *executed >= limits.max_instructions {
|
||||
@@ -340,17 +351,12 @@ impl Vm {
|
||||
name: self.object(function)?.payload().kind_name().into(),
|
||||
expected: signature.returns,
|
||||
};
|
||||
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);
|
||||
self.push_native_return(&mut returns, check)?;
|
||||
}
|
||||
if let Some(Value::Object(receiver)) = arguments.first() {
|
||||
for (name, expected) in self.objects.method_trait_returns(function, *receiver)? {
|
||||
self.push_native_return(&mut returns, NativeReturn { name, expected })?;
|
||||
}
|
||||
returns.push(check);
|
||||
}
|
||||
match self.invoke_native(function, &arguments)? {
|
||||
NativeResult::Return(value) => {
|
||||
@@ -389,6 +395,24 @@ impl Vm {
|
||||
result
|
||||
}
|
||||
|
||||
fn push_native_return(
|
||||
&mut self,
|
||||
returns: &mut Vec<NativeReturn>,
|
||||
check: NativeReturn,
|
||||
) -> Result<(), VmError> {
|
||||
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);
|
||||
Ok(())
|
||||
}
|
||||
fn clear_native_returns(&mut self, returns: Vec<NativeReturn>) {
|
||||
for check in returns {
|
||||
for reference in check.expected.references() {
|
||||
|
||||
@@ -47,7 +47,7 @@ pub use frame::{EndorFrame, ExecutionLimits, ExecutionLocation};
|
||||
pub use objects::ObjectStore;
|
||||
pub use objects::{
|
||||
AnnotationType, ClassField, EndorTraitObject, EndorTypeObject, MethodRequirement, RootTypes,
|
||||
TypeConstructor,
|
||||
TypeConstructor, TypedMethodRequirement,
|
||||
};
|
||||
pub use objects::{
|
||||
CallArity, CallEffect, CallSignature, CallType, ChangeBatch, ChangeKey, CodeLayout, CompareOp,
|
||||
|
||||
@@ -40,6 +40,13 @@ impl Vm {
|
||||
) -> Result<ObjectRef, VmError> {
|
||||
self.objects.new_trait(name, requirements)
|
||||
}
|
||||
pub fn new_typed_trait(
|
||||
&mut self,
|
||||
name: impl Into<String>,
|
||||
requirements: Vec<crate::TypedMethodRequirement>,
|
||||
) -> Result<ObjectRef, VmError> {
|
||||
self.objects.new_typed_trait(name, requirements)
|
||||
}
|
||||
pub fn implement_trait(
|
||||
&mut self,
|
||||
definition: ObjectRef,
|
||||
|
||||
Reference in New Issue
Block a user