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

Refactor try/catch code.

Browse Source
This commit is contained in:
Stephen Chung 2020-10-21 14:45:10 +08:00
parent ad60db5bae
commit 3660e42b96
1 changed files with 23 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/engine.rs
View File

@ -1918,8 +1918,8 @@ impl Engine {
} }
} }
scope.rewind(scope.len() - 1);
state.scope_level -= 1; state.scope_level -= 1;
scope.rewind(scope.len() - 1);
Ok(Default::default()) Ok(Default::default())
} else { } else {
EvalAltResult::ErrorFor(x.1.position()).into() EvalAltResult::ErrorFor(x.1.position()).into()
@ -1940,52 +1940,47 @@ impl Engine {
.eval_stmt(scope, mods, state, lib, this_ptr, body, level) .eval_stmt(scope, mods, state, lib, this_ptr, body, level)
.map(|_| ().into()); .map(|_| ().into());
if let Err(err) = result { match result {
match *err { Ok(_) => result,
Err(err) => match *err {
mut err @ EvalAltResult::ErrorRuntime(_, _) | mut err mut err @ EvalAltResult::ErrorRuntime(_, _) | mut err
if err.catchable() => if err.catchable() =>
{ {
let value = match err { let value = if let EvalAltResult::ErrorRuntime(ref x, _) = err {
EvalAltResult::ErrorRuntime(ref x, _) => x.clone(), x.clone()
_ => { } else {
err.set_position(Position::none()); err.set_position(Position::none());
err.to_string().into() err.to_string().into()
}
}; };
let has_var = if let Some((var_name, _)) = var_def {
let orig_scope_len = scope.len();
state.scope_level += 1;
if let Some((var_name, _)) = var_def {
let var_name = unsafe_cast_var_name_to_lifetime(var_name, &state); let var_name = unsafe_cast_var_name_to_lifetime(var_name, &state);
scope.push(var_name, value); scope.push(var_name, value);
state.scope_level += 1; }
true
} else {
false
};
let mut result = self let mut result = self
.eval_stmt(scope, mods, state, lib, this_ptr, catch_body, level) .eval_stmt(scope, mods, state, lib, this_ptr, catch_body, level)
.map(|_| ().into()); .map(|_| ().into());
if let Some(result_err) = result.as_ref().err() { if let Some(result_err) = result.as_ref().err() {
match result_err.as_ref() { if let EvalAltResult::ErrorRuntime(Dynamic(Union::Unit(_)), pos) =
EvalAltResult::ErrorRuntime(x, pos) if x.is::<()>() => { result_err.as_ref()
{
err.set_position(*pos); err.set_position(*pos);
result = Err(Box::new(err)); result = Err(Box::new(err));
} }
_ => (),
}
} }
if has_var {
scope.rewind(scope.len() - 1);
state.scope_level -= 1; state.scope_level -= 1;
} scope.rewind(orig_scope_len);
result result
} }
_ => Err(err), _ => Err(err),
} },
} else {
result
} }
} }