From 1d8e3f4f8b4479a47e744b3d153fe0e624958817 Mon Sep 17 00:00:00 2001 From: Vincent Ambo Date: Thu, 14 Jan 2021 18:16:31 +0300 Subject: 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 Tested-by: BuildkiteCI --- users/tazjin/rlox/src/interpreter.rs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'users/tazjin/rlox/src/interpreter.rs') diff --git a/users/tazjin/rlox/src/interpreter.rs b/users/tazjin/rlox/src/interpreter.rs index ef188b797fa8..f04d767dc5a9 100644 --- a/users/tazjin/rlox/src/interpreter.rs +++ b/users/tazjin/rlox/src/interpreter.rs @@ -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>) -> Result, 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, Error> { match expr { Expr::Assign(assign) => self.eval_assign(assign), -- cgit 1.4.1