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

Simplify switch condition.

Browse Source
This commit is contained in:
Stephen Chung
2022-04-19 16:20:43 +08:00
parent 40c4906336
commit 770b2e04cc
4 changed files with 131 additions and 136 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/eval/stmt.rs
View File

@@ -392,23 +392,16 @@ impl Engine {
// First check hashes
if let Some(case_block) = cases.get(&hash) {
let cond_result = case_block
.condition
.as_ref()
.map(|cond| {
self.eval_expr(
scope, global, caches, lib, this_ptr, cond, level,
)
let cond_result = match case_block.condition {
Expr::BoolConstant(b, ..) => Ok(b),
ref c => self
.eval_expr(scope, global, caches, lib, this_ptr, c, level)
.and_then(|v| {
v.as_bool().map_err(|typ| {
self.make_type_mismatch_err::<bool>(
typ,
cond.position(),
)
self.make_type_mismatch_err::<bool>(typ, c.position())
})
})
})
.unwrap_or(Ok(true));
}),
};
match cond_result {
Ok(true) => Ok(Some(&case_block.statements)),
@@ -426,23 +419,19 @@ impl Engine {
|| (inclusive && (start..=end).contains(&value))
})
{
let cond_result = block
.condition
.as_ref()
.map(|cond| {
self.eval_expr(
scope, global, caches, lib, this_ptr, cond, level,
)
let cond_result = match block.condition {
Expr::BoolConstant(b, ..) => Ok(b),
ref c => self
.eval_expr(scope, global, caches, lib, this_ptr, c, level)
.and_then(|v| {
v.as_bool().map_err(|typ| {
self.make_type_mismatch_err::<bool>(
typ,
cond.position(),
c.position(),
)
})
})
})
.unwrap_or(Ok(true));
}),
};
match cond_result {
Ok(true) => result = Ok(Some(&block.statements)),