diff --git a/src/parser.rs b/src/parser.rs index fae4498..b7a8d2c 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -27,16 +27,16 @@ where } } - fn peek_token(&mut self) -> Option<&Token> { + fn peek(&mut self) -> Option<&Token> { self.tokens.peek().map(|spanned| spanned.node()) } - fn next_token(&mut self) -> Option> { + fn next(&mut self) -> Option> { self.tokens.next() } - fn expect(&mut self, expected: Token) -> Result, ParseError> { - let next = self.next_token().ok_or_else(|| ParseError { + fn next_expected(&mut self, expected: Token) -> Result, ParseError> { + let next = self.next().ok_or_else(|| ParseError { span: self.current_span, message: format!("Expected {:?}, found end of file", expected), })?; @@ -62,25 +62,25 @@ where pub fn parse(&mut self) -> Vec> { let mut stmts = Vec::new(); - while self.peek_token().is_some() { + while self.peek().is_some() { stmts.push(self.parse_stmt()); } stmts } fn parse_stmt(&mut self) -> Result { - match self.peek_token() { + match self.peek() { Some(Token::Let) => { - let r#let = self.next_token().unwrap(); - let ident = self.expect(Token::Ident).map(|spanned| { + let r#let = self.next().unwrap(); + let ident = self.next_expected(Token::Ident).map(|spanned| { Ok(Ident { name: self.slice(*spanned.span())?.to_string(), span: *spanned.span(), }) })??; - self.expect(Token::Equals)?; + self.next_expected(Token::Equals)?; let expr = self.parse_expr()?; - let semi = self.expect(Token::Semicolon)?; + let semi = self.next_expected(Token::Semicolon)?; Ok(Let { name: ident, ty: None, @@ -107,9 +107,9 @@ where } fn parse_expr(&mut self) -> Result { - match self.peek_token() { + match self.peek() { Some(Token::Number) => { - let token = self.next_token().unwrap(); + let token = self.next().unwrap(); let raw = self.slice(*token.span())?; let number = LitNumber { value: raw.parse::().map_err(|e| ParseError { @@ -121,7 +121,7 @@ where Ok(Expr::Literal(number.into())) } Some(Token::String) => { - let token = self.next_token().unwrap(); + let token = self.next().unwrap(); let raw = self.slice(*token.span())?; let string = LitString { value: raw[1..raw.len() - 1].to_string(), @@ -130,9 +130,10 @@ where Ok(Expr::Literal(string.into())) } Some(Token::Ident) => { - let token = self.next_token().unwrap(); + let token = self.next().unwrap(); + let raw = self.slice(*token.span())?; let ident = Ident { - name: self.slice(*token.span())?.to_string(), + name: raw.to_string(), span: *token.span(), }; Ok(Expr::Variable(ident)) @@ -194,7 +195,50 @@ mod tests { span: Span::new(0, 14), })) ); - pretty_assertions::assert_eq!(parser.next_token(), None); + pretty_assertions::assert_eq!(parser.next(), None); + + let input = "let x = \"hello\";"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Let(Let { + name: Ident { + name: "x".to_string(), + span: Span::new(4, 5), + }, + ty: None, + value: Expr::Literal( + LitString { + value: "hello".to_string(), + span: Span::new(8, 15) + } + .into() + ), + span: Span::new(0, 16), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); + + let input = "let x = y;"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Let(Let { + name: Ident { + name: "x".to_string(), + span: Span::new(4, 5), + }, + ty: None, + value: Expr::Variable(Ident { + name: "y".to_string(), + span: Span::new(8, 9), + }), + span: Span::new(0, 10), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); } #[test] @@ -212,7 +256,7 @@ mod tests { .into() )) ); - pretty_assertions::assert_eq!(parser.next_token(), None); + pretty_assertions::assert_eq!(parser.next(), None); } #[test] @@ -230,6 +274,21 @@ mod tests { .into() )) ); - pretty_assertions::assert_eq!(parser.next_token(), None); + pretty_assertions::assert_eq!(parser.next(), None); + } + + #[test] + fn expr_variable() { + let input = "x"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_expr(), + Ok(Expr::Variable(Ident { + name: "x".to_string(), + span: Span::new(0, 1) + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); } }