diff --git a/src/ast.rs b/src/ast.rs index 14fd8d2..a9fa957 100644 --- a/src/ast.rs +++ b/src/ast.rs @@ -27,6 +27,12 @@ impl From for Stmt { } } +impl From for Stmt { + fn from(fn_call: FnCall) -> Self { + Expr::FnCall(fn_call).into() + } +} + impl From for Stmt { fn from(block: Block) -> Self { Stmt::Block(block) diff --git a/src/parser.rs b/src/parser.rs index 339a40b..6945213 100644 --- a/src/parser.rs +++ b/src/parser.rs @@ -109,15 +109,41 @@ where name: self.slice(*ident.span())?.to_string(), span: *ident.span(), }; - self.next_expected(Token::Equals)?; - let expr = self.parse_expr()?; - let semi = self.next_expected(Token::Semicolon)?; - Ok(Assign { - span: ident.span.to(semi.span()), - name: ident, - value: expr, + match self.peek() { + Some(Token::Equals) => { + self.next().unwrap(); + let expr = self.parse_expr()?; + let semi = self.next_expected(Token::Semicolon)?; + Ok(Assign { + span: ident.span.to(semi.span()), + name: ident, + value: expr, + } + .into()) + } + Some(Token::ParenL) => { + self.next().unwrap(); + let mut args = Vec::new(); + while self.peek() != Some(&Token::ParenR) { + args.push(self.parse_expr()?); + if self.next_if(Token::Comma).is_none() { + break; + } + } + self.next_expected(Token::ParenR)?; + let semi = self.next_expected(Token::Semicolon)?; + Ok(FnCall { + span: ident.span.to(semi.span()), + name: ident, + args, + } + .into()) + } + _ => Err(ParseError { + span: ident.span, + message: "Unexpected token after identifier".to_string(), + }), } - .into()) } Some(Token::CurlyBracketL) => Ok(Stmt::Block(self.parse_block()?).into()), Some(Token::Fn) => { @@ -509,6 +535,25 @@ mod tests { })) ); pretty_assertions::assert_eq!(parser.next(), None); + + let input = "{ foo(); }"; + let lexer = Lexer::new(input); + let mut parser = Parser::new(input, lexer); + pretty_assertions::assert_eq!( + parser.parse_stmt(), + Ok(Stmt::Block(Block { + stmts: vec![Stmt::Expr(Expr::FnCall(FnCall { + name: Ident { + name: "foo".to_string(), + span: Span::new(2, 5), + }, + args: vec![], + span: Span::new(2, 8), + })),], + span: Span::new(0, 10), + })) + ); + pretty_assertions::assert_eq!(parser.next(), None); } #[test]