Fix bug in property setter op-assignment.
This commit is contained in:
@@ -1,84 +1,35 @@
|
||||
#![cfg(not(feature = "no_function"))]
|
||||
use rhai::{Engine, EvalAltResult, FnNamespace, Module, NativeCallContext, ParseErrorType, INT};
|
||||
use rhai::{Engine, EvalAltResult, FnNamespace, Module, ParseErrorType, Shared, INT};
|
||||
|
||||
#[test]
|
||||
fn test_functions() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
fn test_functions_trait_object() -> Result<(), Box<EvalAltResult>> {
|
||||
trait TestTrait {
|
||||
fn greet(&self) -> INT;
|
||||
}
|
||||
|
||||
assert_eq!(engine.eval::<INT>("fn add(x, n) { x + n } add(40, 2)")?, 42);
|
||||
#[derive(Debug, Clone)]
|
||||
struct ABC(INT);
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn add(x, n,) { x + n } add(40, 2,)")?,
|
||||
42
|
||||
);
|
||||
impl TestTrait for ABC {
|
||||
fn greet(&self) -> INT {
|
||||
self.0
|
||||
}
|
||||
}
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn add(x, n) { x + n } let a = 40; add(a, 2); a")?,
|
||||
40
|
||||
);
|
||||
type MySharedTestTrait = Shared<dyn TestTrait>;
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn add(n) { this + n } let x = 40; x.add(2)")?,
|
||||
42
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn add(n) { this += n; } let x = 40; x.add(2); x")?,
|
||||
42
|
||||
);
|
||||
|
||||
assert_eq!(engine.eval::<INT>("fn mul2(x) { x * 2 } mul2(21)")?, 42);
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn mul2(x) { x *= 2 } let a = 21; mul2(a); a")?,
|
||||
21
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn mul2() { this * 2 } let x = 21; x.mul2()")?,
|
||||
42
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>("fn mul2() { this *= 2; } let x = 21; x.mul2(); x")?,
|
||||
42
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[cfg(not(feature = "no_module"))]
|
||||
#[cfg(not(feature = "unchecked"))]
|
||||
#[test]
|
||||
fn test_functions_context() -> Result<(), Box<EvalAltResult>> {
|
||||
let mut engine = Engine::new();
|
||||
|
||||
engine.set_max_modules(40);
|
||||
engine.register_fn("test", |context: NativeCallContext, x: INT| {
|
||||
context.engine().max_modules() as INT + x
|
||||
});
|
||||
engine
|
||||
.register_type_with_name::<MySharedTestTrait>("MySharedTestTrait")
|
||||
.register_fn("new_ts", || Shared::new(ABC(42)) as MySharedTestTrait)
|
||||
.register_fn("greet", |x: MySharedTestTrait| x.greet());
|
||||
|
||||
assert_eq!(engine.eval::<INT>("test(2)")?, 42);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_functions_params() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
// Expect duplicated parameters error
|
||||
assert_eq!(
|
||||
*engine
|
||||
.compile("fn hello(x, x) { x }")
|
||||
.expect_err("should be error")
|
||||
.0,
|
||||
ParseErrorType::FnDuplicatedParam("hello".to_string(), "x".to_string())
|
||||
engine.eval::<String>("type_of(new_ts())")?,
|
||||
"MySharedTestTrait"
|
||||
);
|
||||
assert_eq!(engine.eval::<INT>("let x = new_ts(); greet(x)")?, 42);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@@ -110,152 +61,3 @@ fn test_functions_namespaces() -> Result<(), Box<EvalAltResult>> {
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_function_pointers() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert_eq!(engine.eval::<String>(r#"type_of(Fn("abc"))"#)?, "Fn");
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<INT>(
|
||||
r#"
|
||||
fn foo(x) { 40 + x }
|
||||
|
||||
let f = Fn("foo");
|
||||
call(f, 2)
|
||||
"#
|
||||
)?,
|
||||
42
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>(
|
||||
r#"
|
||||
fn foo(x) { 40 + x }
|
||||
|
||||
let fn_name = "f";
|
||||
fn_name += "oo";
|
||||
|
||||
let f = Fn(fn_name);
|
||||
f.call(2)
|
||||
"#
|
||||
)?,
|
||||
42
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert!(matches!(
|
||||
*engine.eval::<INT>(r#"let f = Fn("abc"); f.call(0)"#).expect_err("should error"),
|
||||
EvalAltResult::ErrorFunctionNotFound(f, _) if f.starts_with("abc (")
|
||||
));
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>(
|
||||
r#"
|
||||
fn foo(x) { 40 + x }
|
||||
|
||||
let x = #{ action: Fn("foo") };
|
||||
x.action.call(2)
|
||||
"#
|
||||
)?,
|
||||
42
|
||||
);
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert_eq!(
|
||||
engine.eval::<INT>(
|
||||
r#"
|
||||
fn foo(x) { this.data += x; }
|
||||
|
||||
let x = #{ data: 40, action: Fn("foo") };
|
||||
x.action(2);
|
||||
x.data
|
||||
"#
|
||||
)?,
|
||||
42
|
||||
);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
#[cfg(not(feature = "no_closure"))]
|
||||
fn test_function_captures() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert_eq!(
|
||||
engine.eval::<INT>(
|
||||
r#"
|
||||
fn foo(y) { x += y; x }
|
||||
|
||||
let x = 41;
|
||||
let y = 999;
|
||||
|
||||
foo!(1) + x
|
||||
"#
|
||||
)?,
|
||||
83
|
||||
);
|
||||
|
||||
assert!(engine
|
||||
.eval::<INT>(
|
||||
r#"
|
||||
fn foo(y) { x += y; x }
|
||||
|
||||
let x = 41;
|
||||
let y = 999;
|
||||
|
||||
foo(1) + x
|
||||
"#
|
||||
)
|
||||
.is_err());
|
||||
|
||||
#[cfg(not(feature = "no_object"))]
|
||||
assert!(matches!(
|
||||
*engine
|
||||
.compile(
|
||||
r#"
|
||||
fn foo() { this += x; }
|
||||
|
||||
let x = 41;
|
||||
let y = 999;
|
||||
|
||||
y.foo!();
|
||||
"#
|
||||
)
|
||||
.expect_err("should error")
|
||||
.0,
|
||||
ParseErrorType::MalformedCapture(_)
|
||||
));
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_function_is_def() -> Result<(), Box<EvalAltResult>> {
|
||||
let engine = Engine::new();
|
||||
|
||||
assert!(engine.eval::<bool>(
|
||||
r#"
|
||||
fn foo(x) { x + 1 }
|
||||
is_def_fn("foo", 1)
|
||||
"#
|
||||
)?);
|
||||
assert!(!engine.eval::<bool>(
|
||||
r#"
|
||||
fn foo(x) { x + 1 }
|
||||
is_def_fn("bar", 1)
|
||||
"#
|
||||
)?);
|
||||
assert!(!engine.eval::<bool>(
|
||||
r#"
|
||||
fn foo(x) { x + 1 }
|
||||
is_def_fn("foo", 0)
|
||||
"#
|
||||
)?);
|
||||
|
||||
Ok(())
|
||||
}
|
||||
|
Reference in New Issue
Block a user