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

Interpreter - Obtain and set a class' superclass

Browse source
This commit is contained in:
Emmanuel BENOîT 2023-01-15 18:18:56 +01:00
parent 031efc33b1
commit 9307fde4b3
1 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/interpreter/interpretable.rs
View file

@ -225,7 +225,22 @@ impl StmtNode {
/// Handle a class declaration
fn on_class_decl(&self, es: &mut InterpreterState, decl: &ClassDecl) -> InterpreterResult {
es.environment.borrow_mut().define(&decl.name, None)?;
let class = Class::new(decl.name.lexeme.clone(), extract_members(es, decl));
let superclass = match &decl.superclass {
None => None,
Some(superclass) => {
let sc_value = superclass.interpret(es)?.result();
if let Some(sc_ref) = sc_value.as_class_ref() {
Some(sc_ref)
} else {
return error(&superclass.token, "superclass must be a class");
}
}
};
let class = Class::new(
decl.name.lexeme.clone(),
superclass,
extract_members(es, decl),
);
es.environment
.borrow_mut()
.assign(&decl.name, class.into())?;
@ -362,9 +377,7 @@ impl Interpretable for ExprNode {
ExprNode::Unary { operator, right } => self.on_unary(es, operator, right),
ExprNode::Grouping { expression } => expression.interpret(es),
ExprNode::Litteral { value } => self.on_litteral(value),
ExprNode::Variable(var_expr) | ExprNode::This(var_expr) => {
Ok(es.lookup_var(var_expr)?.into())
}
ExprNode::Variable(var_expr) | ExprNode::This(var_expr) => var_expr.interpret(es),
ExprNode::Call {
callee,
right_paren,
@ -380,6 +393,12 @@ impl Interpretable for ExprNode {
}
}
impl Interpretable for VariableExpr {
fn interpret(&self, es: &mut InterpreterState) -> InterpreterResult {
Ok(es.lookup_var(self)?.into())
}
}
impl ExprNode {
/// Evaluate a logical operator.
fn on_logic(