kjuulh/rhai
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

Make track_progress inline.

Browse Source
This commit is contained in:
Stephen Chung 2023-03-16 13:30:32 +08:00
parent 55f022174b
commit 9ce581f745
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/eval/data_check.rs
View File

@ -191,6 +191,7 @@ impl Engine {
} }
/// Check if the number of operations stay within limit. /// Check if the number of operations stay within limit.
#[inline(always)]
pub(crate) fn track_operation( pub(crate) fn track_operation(
&self, &self,
global: &mut GlobalRuntimeState, global: &mut GlobalRuntimeState,
@ -199,20 +200,16 @@ impl Engine {
global.num_operations += 1; global.num_operations += 1;
// Guard against too many operations // Guard against too many operations
let max = self.max_operations(); if self.max_operations() > 0 && global.num_operations > self.max_operations() {
Err(ERR::ErrorTooManyOperations(pos).into())
if max > 0 && global.num_operations > max {
return Err(ERR::ErrorTooManyOperations(pos).into());
}
// Report progress
if let Some(ref progress) = self.progress {
match progress(global.num_operations) {
None => Ok(()),
Some(token) => Err(ERR::ErrorTerminated(token, pos).into()),
}
} else { } else {
Ok(()) self.progress
.as_ref()
.and_then(|progress| {
progress(global.num_operations)
.map(|token| Err(ERR::ErrorTerminated(token, pos).into()))
})
.unwrap_or(Ok(()))
} }
} }
} }