feat(tazjin/rlox): Implement function definitions
... with this, functions now work. Note that this bubbled up another weird code structure nit: The parser::Function type should probably not carry its name directly. However this doesn't matter much and I don't care right now. Change-Id: If8e3b23f07033260433b9acd45f37c0e61fd2ff8 Reviewed-on: https://cl.tvl.fyi/c/depot/+/2393 Reviewed-by: tazjin <mail@tazj.in> Tested-by: BuildkiteCI
This commit is contained in:
parent
56d8fa97ed
commit
1d8e3f4f8b
3 changed files with 28 additions and 5 deletions
|
|
@ -41,7 +41,7 @@ impl<'a> Callable<'a> {
|
|||
}
|
||||
|
||||
lox.interpret_block(Rc::new(RwLock::new(fn_env)), &func.body)
|
||||
},
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -220,7 +220,7 @@ impl<'a> Interpreter<'a> {
|
|||
Statement::Block(block) => return self.interpret_block(Default::default(), block),
|
||||
Statement::If(if_stmt) => return self.interpret_if(if_stmt),
|
||||
Statement::While(while_stmt) => return self.interpret_while(while_stmt),
|
||||
Statement::Function(_) => unimplemented!(),
|
||||
Statement::Function(func) => return self.interpret_function(func.clone()),
|
||||
};
|
||||
|
||||
Ok(value)
|
||||
|
|
@ -278,6 +278,13 @@ impl<'a> Interpreter<'a> {
|
|||
Ok(value)
|
||||
}
|
||||
|
||||
fn interpret_function(&mut self, stmt: Rc<parser::Function<'a>>) -> Result<Value<'a>, Error> {
|
||||
let name = stmt.name.clone();
|
||||
let value = Value::Callable(Callable::Function(stmt));
|
||||
self.define_var(&name, value.clone())?;
|
||||
Ok(value)
|
||||
}
|
||||
|
||||
fn eval(&mut self, expr: &Expr<'a>) -> Result<Value<'a>, Error> {
|
||||
match expr {
|
||||
Expr::Assign(assign) => self.eval_assign(assign),
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue