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

Add case alternatives for switch.

Browse Source
This commit is contained in:
Stephen Chung
2022-07-04 17:42:24 +08:00
parent 54db9a2819
commit dee66a409f
9 changed files with 334 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/eval/stmt.rs
View File

@@ -394,6 +394,7 @@ impl Engine {
let (
expr,
SwitchCases {
blocks,
cases,
def_case,
ranges,
@@ -410,7 +411,9 @@ impl Engine {
let hash = hasher.finish();
// First check hashes
if let Some(case_block) = cases.get(&hash) {
if let Some(&case_block) = cases.get(&hash) {
let case_block = &blocks[case_block];
let cond_result = match case_block.condition {
Expr::BoolConstant(b, ..) => Ok(b),
ref c => self
@@ -432,12 +435,9 @@ impl Engine {
let value = value.as_int().expect("`INT`");
let mut result = Ok(None);
for (.., block) in
ranges.iter().filter(|&&(start, end, inclusive, ..)| {
(!inclusive && (start..end).contains(&value))
|| (inclusive && (start..=end).contains(&value))
})
{
for r in ranges.iter().filter(|r| r.contains(value)) {
let block = &blocks[r.index()];
let cond_result = match block.condition {
Expr::BoolConstant(b, ..) => Ok(b),
ref c => self
@@ -481,6 +481,8 @@ impl Engine {
}
} else if let Ok(None) = stmt_block_result {
// Default match clause
let def_case = &blocks[*def_case].statements;
if !def_case.is_empty() {
self.eval_stmt_block(
scope, global, caches, lib, this_ptr, def_case, true, level,