From d771a6a2579f9ea6bdf996abeca0ef43b96af332 Mon Sep 17 00:00:00 2001 From: Rogier Reerink Date: Sat, 14 Nov 2026 23:02:48 +0100 Subject: [PATCH] Parse string literal. --- src/parser.rs | 52 ++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/src/parser.rs b/src/parser.rs index 09fb30c..b4e9164 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -1,7 +1,7 @@ use std::iter::Peekable; use crate::{ - ast::{Expr, Ident, Let, LitNumber, Stmt}, + ast::{Expr, Ident, Let, LitNumber, LitString, Stmt}, lexer::Token, span::{Span, Spanned}, }; @@ -78,11 +78,9 @@ where span: *spanned.span(), }) })??; - self.expect(Token::Equals)?; let expr = self.parse_expr()?; let semi = self.expect(Token::Semicolon)?; - Ok(Let { name: ident, ty: None, @@ -111,16 +109,27 @@ where fn parse_expr(&mut self) -> Result { match self.peek_token() { Some(Token::Number) => { - let number = self.next_token().unwrap(); + let token = self.next_token().unwrap(); + let number = self + .slice(*token.span())? + .parse::() + .map_err(|e| ParseError { + span: *token.span(), + message: format!("Failed to parse number: {}", e), + })?; Ok(LitNumber { - value: self - .slice(*number.span())? - .parse::() - .map_err(|e| ParseError { - span: *number.span(), - message: format!("Failed to parse number: {}", e), - })?, - span: *number.span(), + value: number, + span: *token.span(), + } + .into()) + } + Some(Token::String) => { + let token = self.next_token().unwrap(); + let string = self.slice(*token.span())?; + Ok(LitString { + // Copy without the surrounding quotes + value: string[1..string.len() - 1].to_string(), + span: *token.span(), } .into()) } @@ -201,7 +210,7 @@ mod tests { } #[test] - fn parse_expr_invalid_number() { + fn parse_expr_number_invalid() { let input = "500.0."; let lexer = Lexer::new(input); let mut parser = Parser::new(input, lexer); @@ -215,4 +224,21 @@ mod tests { ); pretty_assertions::assert_eq!(parser.next_token(), None); } + + #[test] + fn parse_expr_string() { + let input = "\"hello\""; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + let result = parser.parse_expr(); + pretty_assertions::assert_eq!( + result, + Ok(LitString { + value: "hello".to_string(), + span: Span::new(0, 7) + } + .into()) + ); + pretty_assertions::assert_eq!(parser.next_token(), None); + } }