Rename auto_restore! to defer!
This commit is contained in:
@@ -67,7 +67,7 @@ impl Engine {
|
||||
idx: &mut Dynamic,
|
||||
pos: Position,
|
||||
) -> RhaiResultOf<Dynamic> {
|
||||
auto_restore! { let orig_level = global.level; global.level += 1 }
|
||||
defer! { let orig_level = global.level; global.level += 1 }
|
||||
|
||||
let hash = hash_idx().0;
|
||||
let args = &mut [target, idx];
|
||||
@@ -88,7 +88,7 @@ impl Engine {
|
||||
is_ref_mut: bool,
|
||||
pos: Position,
|
||||
) -> RhaiResultOf<(Dynamic, bool)> {
|
||||
auto_restore! { let orig_level = global.level; global.level += 1 }
|
||||
defer! { let orig_level = global.level; global.level += 1 }
|
||||
|
||||
let hash = hash_idx().1;
|
||||
let args = &mut [target, idx, new_val];
|
||||
@@ -689,14 +689,14 @@ impl Engine {
|
||||
let reset =
|
||||
self.run_debugger_with_reset(global, caches, scope, this_ptr, rhs)?;
|
||||
#[cfg(feature = "debugging")]
|
||||
auto_restore! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
defer! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
|
||||
let crate::ast::FnCallExpr {
|
||||
name, hashes, args, ..
|
||||
} = &**x;
|
||||
|
||||
// Truncate the index values upon exit
|
||||
auto_restore! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
defer! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
|
||||
let call_args = &mut idx_values[offset..];
|
||||
let arg1_pos = args.get(0).map_or(Position::NONE, Expr::position);
|
||||
@@ -858,14 +858,14 @@ impl Engine {
|
||||
let reset = self
|
||||
.run_debugger_with_reset(global, caches, scope, _tp, _node)?;
|
||||
#[cfg(feature = "debugging")]
|
||||
auto_restore! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
defer! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
|
||||
let crate::ast::FnCallExpr {
|
||||
name, hashes, args, ..
|
||||
} = &**x;
|
||||
|
||||
// Truncate the index values upon exit
|
||||
auto_restore! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
defer! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
|
||||
let call_args = &mut idx_values[offset..];
|
||||
let arg1_pos = args.get(0).map_or(Position::NONE, Expr::position);
|
||||
@@ -978,14 +978,14 @@ impl Engine {
|
||||
global, caches, scope, _tp, _node,
|
||||
)?;
|
||||
#[cfg(feature = "debugging")]
|
||||
auto_restore! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
defer! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
|
||||
let crate::ast::FnCallExpr {
|
||||
name, hashes, args, ..
|
||||
} = &**f;
|
||||
|
||||
// Truncate the index values upon exit
|
||||
auto_restore! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
defer! { idx_values => truncate; let offset = idx_values.len() - args.len(); }
|
||||
|
||||
let call_args = &mut idx_values[offset..];
|
||||
let pos1 = args.get(0).map_or(Position::NONE, Expr::position);
|
||||
|
@@ -242,7 +242,7 @@ impl Engine {
|
||||
let reset =
|
||||
self.run_debugger_with_reset(global, caches, scope, this_ptr.as_deref_mut(), expr)?;
|
||||
#[cfg(feature = "debugging")]
|
||||
auto_restore! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
defer! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
|
||||
match expr {
|
||||
// Constants
|
||||
|
@@ -43,7 +43,7 @@ impl Engine {
|
||||
}
|
||||
|
||||
// Restore scope at end of block if necessary
|
||||
auto_restore! { scope if restore_orig_state => rewind; let orig_scope_len = scope.len(); }
|
||||
defer! { scope if restore_orig_state => rewind; let orig_scope_len = scope.len(); }
|
||||
|
||||
// Restore global state at end of block if necessary
|
||||
let orig_always_search_scope = global.always_search_scope;
|
||||
@@ -54,7 +54,7 @@ impl Engine {
|
||||
global.scope_level += 1;
|
||||
}
|
||||
|
||||
auto_restore! { global if restore_orig_state => move |g| {
|
||||
defer! { global if restore_orig_state => move |g| {
|
||||
g.scope_level -= 1;
|
||||
|
||||
#[cfg(not(feature = "no_module"))]
|
||||
@@ -66,7 +66,7 @@ impl Engine {
|
||||
}}
|
||||
|
||||
// Pop new function resolution caches at end of block
|
||||
auto_restore! {
|
||||
defer! {
|
||||
caches => rewind_fn_resolution_caches;
|
||||
let orig_fn_resolution_caches_len = caches.fn_resolution_caches_len();
|
||||
}
|
||||
@@ -209,7 +209,7 @@ impl Engine {
|
||||
get_builtin_op_assignment_fn(op_x, &*lock_guard, &new_val)
|
||||
{
|
||||
// We may not need to bump the level because built-in's do not need it.
|
||||
//auto_restore! { let orig_level = global.level; global.level += 1 }
|
||||
//defer! { let orig_level = global.level; global.level += 1 }
|
||||
|
||||
let args = &mut [&mut *lock_guard, &mut new_val];
|
||||
let context = need_context
|
||||
@@ -273,7 +273,7 @@ impl Engine {
|
||||
let reset =
|
||||
self.run_debugger_with_reset(global, caches, scope, this_ptr.as_deref_mut(), stmt)?;
|
||||
#[cfg(feature = "debugging")]
|
||||
auto_restore! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
defer! { global if Some(reset) => move |g| g.debugger_mut().reset_status(reset) }
|
||||
|
||||
match stmt {
|
||||
// No-op
|
||||
@@ -673,7 +673,7 @@ impl Engine {
|
||||
let iter_func = iter_func.ok_or_else(|| ERR::ErrorFor(expr.start_position()))?;
|
||||
|
||||
// Restore scope at end of statement
|
||||
auto_restore! { scope => rewind; let orig_scope_len = scope.len(); }
|
||||
defer! { scope => rewind; let orig_scope_len = scope.len(); }
|
||||
|
||||
// Add the loop variables
|
||||
let counter_index = (!counter.is_empty()).then(|| {
|
||||
@@ -808,7 +808,7 @@ impl Engine {
|
||||
};
|
||||
|
||||
// Restore scope at end of block
|
||||
auto_restore! { scope if !catch_var.is_unit() => rewind; let orig_scope_len = scope.len(); }
|
||||
defer! { scope if !catch_var.is_unit() => rewind; let orig_scope_len = scope.len(); }
|
||||
|
||||
if let Expr::Variable(x, ..) = catch_var {
|
||||
scope.push(x.3.clone(), err_value);
|
||||
|
Reference in New Issue
Block a user