tseeker-pub/rust-crafting-interpreters-part-1
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Interpreter - Getter/setter execution

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-14 16:07:40 +01:00
parent c372979009
commit 9627f588d2
2 changed files with 61 additions and 13 deletions
src/interpreter
interpretable.rs

10
src/interpreter/interpretable.rs
View file

@ -2,7 +2,7 @@ use std::{cell::RefCell, collections::HashMap, rc::Rc};
use crate::{
ast::{
ClassDecl, ClassMemberDecl, ClassMemberKind, ExprNode, FunDecl, GetExpr, ProgramNode,
ClassDecl, ExprNode, FunDecl, GetExpr, ProgramNode,
SetExpr, StmtNode, VariableExpr,
},
errors::{ErrorKind, SloxError, SloxResult},
@ -556,8 +556,8 @@ impl ExprNode {
) -> InterpreterResult {
let instance = get_expr.instance.interpret(itpr_state)?.result();
instance.with_property_carrier(
|inst| inst.get(&get_expr.name).map(|v| v.into()),
|| error(&get_expr.name, "only instances have properties"),
|inst| inst.get(itpr_state, &get_expr.name).map(|v| v.into()),
|| error(&get_expr.name, "this object doesn't have properties"),
)
}
@ -571,10 +571,10 @@ impl ExprNode {
instance.with_property_carrier(
|instance| {
let value = set_expr.value.interpret(itpr_state)?.result();
instance.set(&set_expr.name, value.clone());
instance.set(itpr_state, &set_expr.name, value.clone());
Ok(value.into())
},
|| error(&set_expr.name, "only instances have properties"),
|| error(&set_expr.name, "this object doesn't have properties"),
)
}
}