feat(tazjin/rlox): Implement block parsing

Change-Id: I1b7235ed71fa36120984a36f22cd564f59581352
Reviewed-on: https://cl.tvl.fyi/c/depot/+/2303
Reviewed-by: tazjin <mail@tazj.in>
Tested-by: BuildkiteCI
This commit is contained in:
Vincent Ambo 2020-12-31 18:05:58 +03:00 committed by tazjin
parent 3c979acdf3
commit 8915cd6fba
3 changed files with 23 additions and 6 deletions

View file

@ -62,15 +62,16 @@ pub struct Var<'a> {
pub initialiser: Option<Expr<'a>>,
}
pub type Block<'a> = Vec<Statement<'a>>;
#[derive(Debug)]
pub enum Statement<'a> {
Expr(Expr<'a>),
Print(Expr<'a>),
Var(Var<'a>),
Block(Block<'a>),
}
pub type Program<'a> = Vec<Statement<'a>>;
// Parser
/*
@ -143,6 +144,8 @@ impl<'a> Parser<'a> {
fn statement(&mut self) -> StmtResult<'a> {
if self.match_token(&[TokenKind::Print]) {
self.print_statement()
} else if self.match_token(&[TokenKind::LeftBrace]) {
self.block_statement()
} else {
self.expr_statement()
}
@ -154,6 +157,18 @@ impl<'a> Parser<'a> {
Ok(Statement::Print(expr))
}
fn block_statement(&mut self) -> StmtResult<'a> {
let mut block: Block<'a> = vec![];
while !self.check_token(&TokenKind::RightBrace) && !self.is_at_end() {
block.push(self.declaration()?);
}
self.consume(&TokenKind::RightBrace, ErrorKind::ExpectedClosingBrace)?;
Ok(Statement::Block(block))
}
fn expr_statement(&mut self) -> StmtResult<'a> {
let expr = self.expression()?;
self.consume(&TokenKind::Semicolon, ErrorKind::ExpectedSemicolon)?;
@ -349,9 +364,9 @@ impl<'a> Parser<'a> {
}
}
pub fn parse<'a>(tokens: Vec<Token<'a>>) -> Result<Program<'a>, Vec<Error>> {
pub fn parse<'a>(tokens: Vec<Token<'a>>) -> Result<Block<'a>, Vec<Error>> {
let mut parser = Parser { tokens, current: 0 };
let mut program: Program<'a> = vec![];
let mut program: Block<'a> = vec![];
let mut errors: Vec<Error> = vec![];
while !parser.is_at_end() {