diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/ast/mod.rs | 4 | ||||
| -rw-r--r-- | src/ast/parser.rs | 11 | ||||
| -rw-r--r-- | src/interpreter.rs | 5 | ||||
| -rw-r--r-- | src/lexer.rs | 2 |
4 files changed, 22 insertions, 0 deletions
diff --git a/src/ast/mod.rs b/src/ast/mod.rs index d006737..4e1d639 100644 --- a/src/ast/mod.rs +++ b/src/ast/mod.rs @@ -36,6 +36,10 @@ pub enum Stmt { range: (Expr, Expr), body: Vec<Stmt>, }, + While { + condition: Expr, + body: Vec<Stmt>, + }, Return { value: Expr, }, diff --git a/src/ast/parser.rs b/src/ast/parser.rs index 842ad09..bc29f94 100644 --- a/src/ast/parser.rs +++ b/src/ast/parser.rs @@ -118,6 +118,10 @@ impl<'a> AstParser<'a> { return self.for_statement(); } + if self.advance_if_eq(&TokenType::While) { + return self.while_statement(); + } + // If we couldn't parse a statement return an expression statement self.expression_statement() } @@ -186,6 +190,13 @@ impl<'a> AstParser<'a> { } } + fn while_statement(&mut self) -> Stmt { + let condition = self.expression(); + let body = self.block(); + + Stmt::While { condition, body } + } + fn expression_statement(&mut self) -> Stmt { let expr = self.expression(); diff --git a/src/interpreter.rs b/src/interpreter.rs index b548d9e..adf6755 100644 --- a/src/interpreter.rs +++ b/src/interpreter.rs @@ -69,6 +69,11 @@ impl AstVisitor<Value> for AstInterpreter { self.memory.remove(binding); } + Stmt::While { condition, body } => { + while self.visit_expr(condition) == Value::Bool(true) { + self.interpret(body); + } + } Stmt::Return { value } => todo!(), }; diff --git a/src/lexer.rs b/src/lexer.rs index 2d65afc..01d1ab6 100644 --- a/src/lexer.rs +++ b/src/lexer.rs @@ -283,6 +283,8 @@ impl<'a> Iterator for Lexer<'a> { "loop" => TokenType::Loop, "break" => TokenType::Break, "continue" => TokenType::Continue, + "true" => TokenType::Literal(Literal::Bool(true)), + "false" => TokenType::Literal(Literal::Bool(false)), _ => TokenType::Identifier(value), } } |