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/parser.rs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'users/tazjin/rlox/src/parser.rs') diff --git a/users/tazjin/rlox/src/parser.rs b/users/tazjin/rlox/src/parser.rs index 626eda641c03..78aaec105e32 100644 --- a/users/tazjin/rlox/src/parser.rs +++ b/users/tazjin/rlox/src/parser.rs @@ -7,6 +7,7 @@ // have real types. use crate::errors::{Error, ErrorKind}; use crate::scanner::{Token, TokenKind}; +use std::rc::Rc; // AST @@ -108,7 +109,7 @@ pub enum Statement<'a> { Block(Block<'a>), If(If<'a>), While(While<'a>), - Function(Function<'a>), + Function(Rc>), } // Parser @@ -221,11 +222,11 @@ impl<'a> Parser<'a> { ErrorKind::ExpectedToken("Expect '{' before function body."), )?; - Ok(Statement::Function(Function { + Ok(Statement::Function(Rc::new(Function { name, params, body: self.block_statement()?, - })) + }))) } fn var_declaration(&mut self) -> StmtResult<'a> { -- cgit 1.4.1