Parse string literal.
This commit is contained in:
+39
-13
@@ -1,7 +1,7 @@
|
|||||||
use std::iter::Peekable;
|
use std::iter::Peekable;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
ast::{Expr, Ident, Let, LitNumber, Stmt},
|
ast::{Expr, Ident, Let, LitNumber, LitString, Stmt},
|
||||||
lexer::Token,
|
lexer::Token,
|
||||||
span::{Span, Spanned},
|
span::{Span, Spanned},
|
||||||
};
|
};
|
||||||
@@ -78,11 +78,9 @@ where
|
|||||||
span: *spanned.span(),
|
span: *spanned.span(),
|
||||||
})
|
})
|
||||||
})??;
|
})??;
|
||||||
|
|
||||||
self.expect(Token::Equals)?;
|
self.expect(Token::Equals)?;
|
||||||
let expr = self.parse_expr()?;
|
let expr = self.parse_expr()?;
|
||||||
let semi = self.expect(Token::Semicolon)?;
|
let semi = self.expect(Token::Semicolon)?;
|
||||||
|
|
||||||
Ok(Let {
|
Ok(Let {
|
||||||
name: ident,
|
name: ident,
|
||||||
ty: None,
|
ty: None,
|
||||||
@@ -111,16 +109,27 @@ where
|
|||||||
fn parse_expr(&mut self) -> Result<Expr, ParseError> {
|
fn parse_expr(&mut self) -> Result<Expr, ParseError> {
|
||||||
match self.peek_token() {
|
match self.peek_token() {
|
||||||
Some(Token::Number) => {
|
Some(Token::Number) => {
|
||||||
let number = self.next_token().unwrap();
|
let token = self.next_token().unwrap();
|
||||||
|
let number = self
|
||||||
|
.slice(*token.span())?
|
||||||
|
.parse::<f64>()
|
||||||
|
.map_err(|e| ParseError {
|
||||||
|
span: *token.span(),
|
||||||
|
message: format!("Failed to parse number: {}", e),
|
||||||
|
})?;
|
||||||
Ok(LitNumber {
|
Ok(LitNumber {
|
||||||
value: self
|
value: number,
|
||||||
.slice(*number.span())?
|
span: *token.span(),
|
||||||
.parse::<f64>()
|
}
|
||||||
.map_err(|e| ParseError {
|
.into())
|
||||||
span: *number.span(),
|
}
|
||||||
message: format!("Failed to parse number: {}", e),
|
Some(Token::String) => {
|
||||||
})?,
|
let token = self.next_token().unwrap();
|
||||||
span: *number.span(),
|
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())
|
.into())
|
||||||
}
|
}
|
||||||
@@ -201,7 +210,7 @@ mod tests {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[test]
|
#[test]
|
||||||
fn parse_expr_invalid_number() {
|
fn parse_expr_number_invalid() {
|
||||||
let input = "500.0.";
|
let input = "500.0.";
|
||||||
let lexer = Lexer::new(input);
|
let lexer = Lexer::new(input);
|
||||||
let mut parser = Parser::new(input, lexer);
|
let mut parser = Parser::new(input, lexer);
|
||||||
@@ -215,4 +224,21 @@ mod tests {
|
|||||||
);
|
);
|
||||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user