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

Add else to if

Browse Source
This commit is contained in:
jonathandturner
2016-03-03 08:20:55 -05:00
parent 132a640df2
commit 30b914e7b7
3 changed files with 48 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/engine.rs
View File

@@ -120,6 +120,7 @@ impl Engine {
let result3 = self.call_fn("clone", Some(a3), None, None, None, None, None);
let result4 = self.call_fn("clone", Some(a4), None, None, None, None, None);
let result5 = self.call_fn("clone", Some(a5), None, None, None, None, None);
match (result1, result2, result3, result4, result5) {
(Ok(r1), Ok(r2), Ok(r3), Ok(r4), Ok(r5)) => {
new_scope.push((f.params[0].clone(), r1));
@@ -480,6 +481,20 @@ impl Engine {
Err(_) => Err(EvalError::IfGuardMismatch)
}
}
Stmt::IfElse(ref guard, ref body, ref else_body) => {
let guard_result = try!(self.eval_expr(scope, guard));
match guard_result.downcast::<bool>() {
Ok(g) => {
if *g {
self.eval_stmt(scope, body)
}
else {
self.eval_stmt(scope, else_body)
}
}
Err(_) => Err(EvalError::IfGuardMismatch)
}
}
Stmt::While(ref guard, ref body) => {
loop {
let guard_result = try!(self.eval_expr(scope, guard));
@@ -684,6 +699,20 @@ fn test_if() {
else {
assert!(false);
}
if let Ok(result) = engine.eval("if false { 55 } else { 44 }".to_string()).unwrap().downcast::<i32>() {
assert_eq!(*result, 44);
}
else {
assert!(false);
}
if let Ok(result) = engine.eval("if true { 55 } else { 44 }".to_string()).unwrap().downcast::<i32>() {
assert_eq!(*result, 55);
}
else {
assert!(false);
}
}
#[test]