Parse let and number expression.
This commit is contained in:
+217
@@ -1 +1,218 @@
|
||||
use std::iter::Peekable;
|
||||
|
||||
use crate::{
|
||||
ast::{Expr, Ident, Let, LitNumber, Stmt},
|
||||
lexer::Token,
|
||||
span::{Span, Spanned},
|
||||
};
|
||||
|
||||
pub struct Parser<'a, T>
|
||||
where
|
||||
T: Iterator<Item = Spanned<Token>>,
|
||||
{
|
||||
input: &'a str,
|
||||
tokens: Peekable<T>,
|
||||
current_span: Span,
|
||||
}
|
||||
|
||||
impl<'a, T> Parser<'a, T>
|
||||
where
|
||||
T: Iterator<Item = Spanned<Token>>,
|
||||
{
|
||||
pub fn new(input: &'a str, tokens: T) -> Self {
|
||||
Self {
|
||||
input,
|
||||
tokens: tokens.peekable(),
|
||||
current_span: Span::default(),
|
||||
}
|
||||
}
|
||||
|
||||
fn peek_token(&mut self) -> Option<&Token> {
|
||||
self.tokens.peek().map(|spanned| spanned.node())
|
||||
}
|
||||
|
||||
fn next_token(&mut self) -> Option<Spanned<Token>> {
|
||||
self.tokens.next()
|
||||
}
|
||||
|
||||
fn expect(&mut self, expected: Token) -> Result<Spanned<Token>, ParseError> {
|
||||
let next = self.next_token().ok_or_else(|| ParseError {
|
||||
span: self.current_span,
|
||||
message: format!("Expected {:?}, found end of file", expected),
|
||||
})?;
|
||||
|
||||
if next.node() == &expected {
|
||||
Ok(next)
|
||||
} else {
|
||||
Err(ParseError {
|
||||
span: self.current_span,
|
||||
message: format!("Expected {:?}, found {:?}", expected, next.node()),
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
fn slice(&self, span: Span) -> Result<&'a str, ParseError> {
|
||||
self.input
|
||||
.get(span.start()..span.end())
|
||||
.ok_or_else(|| ParseError {
|
||||
span,
|
||||
message: "Span out of bounds".to_string(),
|
||||
})
|
||||
}
|
||||
|
||||
pub fn parse(&mut self) -> Vec<Result<Stmt, ParseError>> {
|
||||
let mut stmts = Vec::new();
|
||||
while self.peek_token().is_some() {
|
||||
stmts.push(self.parse_stmt());
|
||||
}
|
||||
stmts
|
||||
}
|
||||
|
||||
fn parse_stmt(&mut self) -> Result<Stmt, ParseError> {
|
||||
match self.peek_token() {
|
||||
Some(Token::Let) => {
|
||||
let r#let = self.next_token().unwrap();
|
||||
let ident = self.expect(Token::Ident).map(|spanned| {
|
||||
Ok(Ident {
|
||||
name: self.slice(*spanned.span())?.to_string(),
|
||||
span: *spanned.span(),
|
||||
})
|
||||
})??;
|
||||
|
||||
self.expect(Token::Equals)?;
|
||||
let expr = self.parse_expr()?;
|
||||
let semi = self.expect(Token::Semicolon)?;
|
||||
|
||||
Ok(Let {
|
||||
name: ident,
|
||||
ty: None,
|
||||
value: expr,
|
||||
span: r#let.span_to(&semi),
|
||||
}
|
||||
.into())
|
||||
}
|
||||
Some(Token::Ident) => {
|
||||
unimplemented!()
|
||||
}
|
||||
Some(Token::Fn) => {
|
||||
unimplemented!()
|
||||
}
|
||||
Some(_) => Err(ParseError {
|
||||
span: self.current_span,
|
||||
message: "Unexpected token in statement".to_string(),
|
||||
}),
|
||||
None => Err(ParseError {
|
||||
span: self.current_span,
|
||||
message: "Unexpected end of file".to_string(),
|
||||
}),
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_expr(&mut self) -> Result<Expr, ParseError> {
|
||||
match self.peek_token() {
|
||||
Some(Token::Number) => {
|
||||
let number = self.next_token().unwrap();
|
||||
Ok(LitNumber {
|
||||
value: self
|
||||
.slice(*number.span())?
|
||||
.parse::<f64>()
|
||||
.map_err(|e| ParseError {
|
||||
span: *number.span(),
|
||||
message: format!("Failed to parse number: {}", e),
|
||||
})?,
|
||||
span: *number.span(),
|
||||
}
|
||||
.into())
|
||||
}
|
||||
Some(_) => Err(ParseError {
|
||||
span: self.current_span,
|
||||
message: "Unexpected token in expression".to_string(),
|
||||
}),
|
||||
None => Err(ParseError {
|
||||
span: self.current_span,
|
||||
message: "Unexpected end of file".to_string(),
|
||||
}),
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug, PartialEq)]
|
||||
pub struct ParseError {
|
||||
span: Span,
|
||||
message: String,
|
||||
}
|
||||
|
||||
impl ParseError {
|
||||
pub fn span(&self) -> Span {
|
||||
self.span
|
||||
}
|
||||
|
||||
pub fn message(&self) -> &str {
|
||||
&self.message
|
||||
}
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use crate::lexer::Lexer;
|
||||
|
||||
use super::*;
|
||||
|
||||
#[test]
|
||||
fn parse_stmt_let_untyped() {
|
||||
let input = "let x = 500.0;";
|
||||
let lexer = Lexer::new(input);
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
let result = parser.parse_stmt();
|
||||
pretty_assertions::assert_eq!(
|
||||
result,
|
||||
Ok(Stmt::Let(Let {
|
||||
name: Ident {
|
||||
name: "x".to_string(),
|
||||
span: Span::new(4, 5),
|
||||
},
|
||||
ty: None,
|
||||
value: LitNumber {
|
||||
value: 500.0,
|
||||
span: Span::new(8, 13)
|
||||
}
|
||||
.into(),
|
||||
span: Span::new(0, 14),
|
||||
}))
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_expr_number() {
|
||||
let input = "500.0";
|
||||
let lexer = Lexer::new(input);
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
let result = parser.parse_expr();
|
||||
pretty_assertions::assert_eq!(
|
||||
result,
|
||||
Ok(LitNumber {
|
||||
value: 500.0,
|
||||
span: Span::new(0, 5)
|
||||
}
|
||||
.into())
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn parse_expr_invalid_number() {
|
||||
let input = "500.0.";
|
||||
let lexer = Lexer::new(input);
|
||||
let mut parser = Parser::new(input, lexer);
|
||||
let result = parser.parse_expr();
|
||||
pretty_assertions::assert_eq!(
|
||||
result,
|
||||
Err(ParseError {
|
||||
span: Span::new(0, 6),
|
||||
message: "Failed to parse number: invalid float literal".to_string()
|
||||
})
|
||||
);
|
||||
pretty_assertions::assert_eq!(parser.next_token(), None);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user