Allow if expressions.

tests/call_fn.rs

@@ -1,9 +1,9 @@
 #![cfg(not(feature = "no_function"))]
-use rhai::{Engine, EvalAltResult, ParseError, ParseErrorType, INT};
+use rhai::{Engine, EvalAltResult, ParseErrorType, INT};
 
 #[test]
 fn test_fn() -> Result<(), EvalAltResult> {
-    let mut engine = Engine::new();
+    let engine = Engine::new();
 
     // Expect duplicated parameters error
     match engine

tests/expressions.rs

@@ -12,14 +12,15 @@ fn test_expressions() -> Result<(), EvalAltResult> {
         engine.eval_expression_with_scope::<INT>(&mut scope, "2 + (x + 10) * 2")?,
         42
     );
+    assert_eq!(
+        engine.eval_expression_with_scope::<INT>(&mut scope, "if x > 0 { 42 } else { 123 }")?,
+        42
+    );
 
     assert!(engine.eval_expression::<()>("40 + 2;").is_err());
     assert!(engine.eval_expression::<()>("40 + { 2 }").is_err());
     assert!(engine.eval_expression::<()>("x = 42").is_err());
     assert!(engine.compile_expression("let x = 42").is_err());
-    assert!(engine
-        .eval_expression_with_scope::<INT>(&mut scope, "if x > 0 { 42 } else { 123 }")
-        .is_err());
 
     Ok(())
 }

tests/if_block.rs

@@ -27,3 +27,21 @@ fn test_if() -> Result<(), EvalAltResult> {
 
     Ok(())
 }
+
+#[test]
+fn test_if_expr() -> Result<(), EvalAltResult> {
+    let mut engine = Engine::new();
+
+    assert_eq!(
+        engine.eval::<INT>(
+            r"
+                let x = 42;
+                let y = 1 + if x > 40 { 100 } else { 0 } / x;
+                y
+        "
+        )?,
+        3
+    );
+
+    Ok(())
+}

tests/method_call.rs

@@ -25,8 +25,10 @@ fn test_method_call() -> Result<(), EvalAltResult> {
     engine.register_fn("new_ts", TestStruct::new);
 
     let ts = engine.eval::<TestStruct>("let x = new_ts(); x.update(); x")?;
-
     assert_eq!(ts.x, 1001);
 
+    let ts = engine.eval::<TestStruct>("let x = new_ts(); update(x); x")?;
+    assert_eq!(ts.x, 1);
+
     Ok(())
 }