Validate unified source and native positional call contracts
This commit is contained in:
@@ -13,7 +13,49 @@ pub enum NativeResult {
|
||||
},
|
||||
}
|
||||
|
||||
/// Accepted positional argument interval, including explicit receivers.
|
||||
/// The store validates metadata before use; usize::MAX denotes an open upper bound.
|
||||
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
|
||||
pub struct CallArity {
|
||||
pub required: usize,
|
||||
pub maximum: usize,
|
||||
}
|
||||
impl CallArity {
|
||||
pub const fn exact(count: usize) -> Self {
|
||||
Self::range(count, count)
|
||||
}
|
||||
pub const fn range(required: usize, maximum: usize) -> Self {
|
||||
Self { required, maximum }
|
||||
}
|
||||
pub fn accepts(self, count: usize) -> bool {
|
||||
(self.required..=self.maximum).contains(&count)
|
||||
}
|
||||
pub(crate) fn validate(self) -> Result<Self, VmError> {
|
||||
if self.required > self.maximum {
|
||||
return Err(VmError::InvalidArgument("invalid callable arity metadata"));
|
||||
}
|
||||
Ok(self)
|
||||
}
|
||||
pub(crate) fn check(self, name: String, provided: usize) -> Result<(), VmError> {
|
||||
self.validate()?;
|
||||
if !self.accepts(provided) {
|
||||
return Err(VmError::ArgumentCount {
|
||||
name,
|
||||
required: self.required,
|
||||
maximum: self.maximum,
|
||||
provided,
|
||||
});
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub trait NativeCallable: fmt::Debug + Send + Sync + 'static {
|
||||
/// Optional positional contract. Missing metadata remains an explicit legacy gap.
|
||||
fn arity(&self) -> Option<CallArity> {
|
||||
None
|
||||
}
|
||||
|
||||
fn invoke(
|
||||
&self,
|
||||
context: &mut NativeContext<'_>,
|
||||
@@ -149,6 +191,12 @@ impl<'a> NativeContext<'a> {
|
||||
arguments: &[Value],
|
||||
callable: Arc<dyn NativeCallable>,
|
||||
) -> Result<NativeResult, VmError> {
|
||||
if let Some(arity) = callable.arity() {
|
||||
arity.check(
|
||||
store.object(function)?.payload().kind_name().into(),
|
||||
arguments.len(),
|
||||
)?;
|
||||
}
|
||||
let mut context = Self {
|
||||
store,
|
||||
roots: Vec::new(),
|
||||
|
||||
Reference in New Issue
Block a user