Do not error when a property is read-only.
This commit is contained in:
parent
d83b829810
commit
798e1df298
@ -885,7 +885,11 @@ impl Engine {
|
|||||||
if let Expr::Property(id, pos) = dot_lhs.as_ref() {
|
if let Expr::Property(id, pos) = dot_lhs.as_ref() {
|
||||||
let fn_name = make_setter(id);
|
let fn_name = make_setter(id);
|
||||||
args[1] = indexed_val;
|
args[1] = indexed_val;
|
||||||
self.exec_fn_call(fn_lib, &fn_name, &mut args, None, *pos, 0)?;
|
self.exec_fn_call(fn_lib, &fn_name, &mut args, None, *pos, 0).or_else(|err| match *err {
|
||||||
|
// If there is no setter, no need to feed it back because the property is read-only
|
||||||
|
EvalAltResult::ErrorDotExpr(_,_) => Ok(Default::default()),
|
||||||
|
err => Err(Box::new(err))
|
||||||
|
})?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -7,6 +7,7 @@ fn test_get_set() -> Result<(), Box<EvalAltResult>> {
|
|||||||
#[derive(Clone)]
|
#[derive(Clone)]
|
||||||
struct TestStruct {
|
struct TestStruct {
|
||||||
x: INT,
|
x: INT,
|
||||||
|
y: INT,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl TestStruct {
|
impl TestStruct {
|
||||||
@ -18,8 +19,12 @@ fn test_get_set() -> Result<(), Box<EvalAltResult>> {
|
|||||||
self.x = new_x;
|
self.x = new_x;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn get_y(&mut self) -> INT {
|
||||||
|
self.y
|
||||||
|
}
|
||||||
|
|
||||||
fn new() -> Self {
|
fn new() -> Self {
|
||||||
TestStruct { x: 1 }
|
TestStruct { x: 1, y: 0 }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -28,9 +33,13 @@ fn test_get_set() -> Result<(), Box<EvalAltResult>> {
|
|||||||
engine.register_type::<TestStruct>();
|
engine.register_type::<TestStruct>();
|
||||||
|
|
||||||
engine.register_get_set("x", TestStruct::get_x, TestStruct::set_x);
|
engine.register_get_set("x", TestStruct::get_x, TestStruct::set_x);
|
||||||
|
engine.register_get("y", TestStruct::get_y);
|
||||||
|
engine.register_fn("add", |value: &mut INT| *value += 41);
|
||||||
engine.register_fn("new_ts", TestStruct::new);
|
engine.register_fn("new_ts", TestStruct::new);
|
||||||
|
|
||||||
assert_eq!(engine.eval::<INT>("let a = new_ts(); a.x = 500; a.x")?, 500);
|
assert_eq!(engine.eval::<INT>("let a = new_ts(); a.x = 500; a.x")?, 500);
|
||||||
|
assert_eq!(engine.eval::<INT>("let a = new_ts(); a.x.add(); a.x")?, 42);
|
||||||
|
assert_eq!(engine.eval::<INT>("let a = new_ts(); a.y.add(); a.y")?, 0);
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user