From 3002eedbdfb9ac883b42a1e8e96cbb218b0156e5 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sun, 15 Nov 2026 12:08:27 +0100 Subject: [PATCH] Assingment parsing. --- src/parser.rs | 87 +++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 85 insertions(+), 2 deletions(-) diff --git a/src/parser.rs b/src/parser.rs index 06141c5..af2f088 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,7 +1,7 @@ use std::iter::Peekable; use crate::{ - ast::{Expr, FnCall, Ident, Let, LitNumber, LitString, Stmt}, + ast::{Assign, Expr, FnCall, Ident, Let, LitNumber, LitString, Stmt}, lexer::Token, span::{Span, Spanned}, }; @@ -99,7 +99,20 @@ where .into()) } Some(Token::Ident) => { - unimplemented!() + let token = self.next().unwrap(); + let ident = Ident { + name: self.slice(*token.span())?.to_string(), + span: *token.span(), + }; + self.next_expected(Token::Equals)?; + let expr = self.parse_expr()?; + let semi = self.next_expected(Token::Semicolon)?; + Ok(Assign { + name: ident, + value: expr, + span: token.span_to(&semi), + } + .into()) } Some(Token::Fn) => { unimplemented!() @@ -314,6 +327,76 @@ mod tests { pretty_assertions::assert_eq!(parser.next(), None); } + #[test] + fn stmt_assigns() { + let input = "x = 42;"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Assign(Assign { + name: Ident { + name: "x".to_string(), + span: Span::new(0, 1), + }, + value: Expr::Literal( + LitNumber { + value: 42.0, + span: Span::new(4, 6) + } + .into() + ), + span: Span::new(0, 7), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + + let input = "x = y;"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Assign(Assign { + name: Ident { + name: "x".to_string(), + span: Span::new(0, 1), + }, + value: Expr::Variable(Ident { + name: "y".to_string(), + span: Span::new(4, 5), + }), + span: Span::new(0, 6), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + + let input = "x = y(z);"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Assign(Assign { + name: Ident { + name: "x".to_string(), + span: Span::new(0, 1), + }, + value: Expr::FnCall(FnCall { + name: Ident { + name: "y".to_string(), + span: Span::new(4, 5), + }, + args: vec![Expr::Variable(Ident { + name: "z".to_string(), + span: Span::new(6, 7), + })], + span: Span::new(4, 8), + }), + span: Span::new(0, 9), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + } + #[test] fn expr_numbers() { let input = "500.0";